DiadFit 1.0.8__py3-none-any.whl → 1.0.9__py3-none-any.whl

DiadFit/_version.py

@@ -5,4 +5,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module
-__version__ = '1.0.8'
+__version__ = '1.0.9'

DiadFit/densimeter_fitting.py

@@ -15,6 +15,7 @@ from scipy import stats
 
 encode="ISO-8859-1"
 
+## Files are fit using the folder UCB_cali_fitting_1117_1447
 
 def calculate_generic_std_err_values(*, pickle_str, new_x, CI=0.67):
 

DiadFit/densimeters.py

@@ -994,7 +994,7 @@ CI_split=0.67, CI_neon=0.67,  Ne_pickle_str=None, pref_Ne=None, Ne_err=None, cor
     corrected_split: pd.Series
         Corrected splitting  (cm-1)  
         
-    Split_err: float, int
+    split_err: float, int
         Error on corrected splitting
 
     temp: str

DiadFit/diads.py

@@ -33,54 +33,7 @@ allowed_models = ["VoigtModel", "PseudoVoigtModel", "Pearson4Model", "SkewedVoig
 #warnings.simplefilter('error')
 
 encode="ISO-8859-1"
-## Ratio of different peaks
 
-
-def calculate_SO2_CO2_ratio(SO2_area, diad1_area, diad2_area, SO2_cross_sec=5.3, diad1_cross_sec=0.89, diad2_cross_sec=1.4):
-    """ Calculates SO2:CO2 ratio using the parameters from Marie-Camille Caumons lab"""
-
-
-    A_CO2_star=( diad1_area + diad2_area)/(diad2_cross_sec+diad1_cross_sec)
-    A_SO2_star=(SO2_area)/(SO2_cross_sec)
-    Ratio=A_SO2_star/(A_SO2_star+A_CO2_star)
-
-    return Ratio
-
-def calculate_mole_fraction_2comp(peak_area_a, peak_area_b, cross_section_a, cross_section_b, instrument_eff_a, instrument_eff_b):
-    """ This function calculates the molar ration of 2 components a and b based on peak areas,
-    cross section and instrument efficiency
-
-    Parameters
-    ------------
-
-    peak_area_a: int, float, pd.Series, np.array
-        Peak area of component a
-
-    peak_area_b: int, float, pd.Series, np.array
-        Peak area of component b
-
-    cross_section_a, cross_section_a: int, float
-        Raman cross section for component a and b
-
-    instrument_eff_a, instrument_eff_b: int, float
-        Instrument effeciency of a and b.
-
-    Returns
-    ------------
-    pd.DataFrame
-        Molar ratio of a/b
-
-
-    """
-
-    Sum_phase_a=peak_area_a/(cross_section_a*instrument_eff_a)
-    Sum_phase_b=peak_area_b/(cross_section_b*instrument_eff_b)
-
-    df=pd.DataFrame(data={'% A': 100*Sum_phase_a/(Sum_phase_b+Sum_phase_a),
-    '% B': 100-100*Sum_phase_a/(Sum_phase_b+Sum_phase_a)}
-    )
-
-    return df
 def plot_diad(*,path=None, filename=None, filetype='Witec_ASCII', Spectra_x=None, Spectra_y=None):
     """This function makes a plot of the spectra for a specific file to allow visual inspectoin
 

DiadFit/molar_gas_proportions.py

@@ -2,90 +2,95 @@ import math
 import pandas as pd
 import numpy as np
 
-def calculate_sigma(wavelength, vi_dict, T_K):
-    """
-    This function calculates the σ cross section according to wavelength based on Burke (2001) EQ(1), you must provide:
-### 1) the peak shift of the species, 2) temp (doesn't really matter) and 3) Σ (wavelength-independent relative Raman scattering cross-sections).
-    """
-    c = 2.998 * 10**10  # cm/s light speed
-    h = 6.626 * 10**-27  # erg.s Planck constant
-    k = 1.381 * 10**-16  # erg/K Boltzmann's constant
-
-    v0 = 1 / (wavelength * 10**-7)
-
-    sigma_results = {}
-    for name, vi_info in vi_dict.items():
-        vi = vi_info["Peak_shift_cm-1"]
-        BigSigma = vi_info["Σ"]
-
-        result = BigSigma / (((v0 - vi)**-4 / (v0 - 2331)**-4) * (1 - math.exp(-h * c * vi / (k * T_K))))
-        sigma_results[name] = round(result, 2)
-
-    return sigma_results
-
-
-
-
-def calculate_mole_percent(components):
-    """ This function calculates the mole percents of the components entered, based on Burke (2001) EQ(2)
-    """
-    def partial_molec_contribution_single(A, sigma, squiggle):
-        return A / (sigma * squiggle)
-
-    def partial_molec_contribution_double(A1, sigma1, A2, sigma2, squiggle):
-        return (A1 + A2) / ((sigma1 + sigma2) * squiggle)
-
-    total_partials = 0
-    partials = []
-
-    for component in components:
-        if component['name'] == 'CO2':
-            partial = partial_molec_contribution_double(component['peak_area_1'], component['cross_section_1'],
-                                                       component['peak_area_2'], component['cross_section_2'],
-                                                       component['efficiency'])
-        else:
-            partial = partial_molec_contribution_single(component['peak_area'], component['cross_section'],
-                                                        component['efficiency'])
-
-        partials.append(partial)
-        total_partials += partial
-
-    mole_percentages = [round((partial / total_partials) * 100, 1) for partial in partials]
-
-    mole_percent_dict = {component['name']: mole_percent for component, mole_percent in zip(components, mole_percentages)}
-    mole_percent_dict['Mole_Percent_Sum'] = sum(mole_percentages)
-
-    return mole_percent_dict
-
-
-
 
-def calculate_CO2_SO2_ratio(*, peak_area_SO2, peak_area_diad1, peak_area_diad2,wavelength=532.067, T_K=37+273.15,efficiency_SO2=1, efficiency_CO2=0.5, sigma_SO2=4.03, sigma_CO2_v1=0.8, sigma_CO2_v2=1.23):
 
-  # First we need to calculate the oarameters
 
-  component_dict = {
-    "SO2": {"Peak_shift_cm-1": 1151, "Σ": sigma_SO2},
-    "CO2_v1": {"Peak_shift_cm-1": 1285, "Σ": sigma_CO2_v1},
-    "CO2_2v2": {"Peak_shift_cm-1": 1388, "Σ": sigma_CO2_v2}}
-### "Σ" is the wavelength independent relative cross-section
 
-  sigma_results = calculate_sigma(wavelength=wavelength, vi_dict=component_dict, T_K=T_K)
 
-    # Now lets allocate these calculations
-  components = [
-        {'name': 'SO2',
-        'peak_area': peak_area_SO2,
-        'cross_section':  sigma_results['SO2'],
-        'efficiency': efficiency_SO2},
-        {'name': 'CO2',
-          'peak_area_1':peak_area_diad2, 'cross_section_1': sigma_results['CO2_2v2'],
-        'peak_area_2': peak_area_diad1, 'cross_section_2': sigma_results['CO2_v1'], 'efficiency': efficiency_CO2}
-    ]
-  mol_perc=calculate_mole_percent(components)
-
-
-  return pd.DataFrame(mol_perc)
+# def calculate_sigma(wavelength, vi_dict, T_K):
+#     """
+#     This function calculates the σ cross section according to wavelength based on Burke (2001) EQ(1), you must provide:
+# ### 1) the peak shift of the species, 2) temp (doesn't really matter) and 3) Σ (wavelength-independent relative Raman scattering cross-sections).
+#     """
+#     c = 2.998 * 10**10  # cm/s light speed
+#     h = 6.626 * 10**-27  # erg.s Planck constant
+#     k = 1.381 * 10**-16  # erg/K Boltzmann's constant
+#
+#     v0 = 1 / (wavelength * 10**-7)
+#
+#     sigma_results = {}
+#     for name, vi_info in vi_dict.items():
+#         vi = vi_info["Peak_shift_cm-1"]
+#         BigSigma = vi_info["Σ"]
+#
+#         result = BigSigma / (((v0 - vi)**-4 / (v0 - 2331)**-4) * (1 - math.exp(-h * c * vi / (k * T_K))))
+#         sigma_results[name] = round(result, 2)
+#
+#     return sigma_results
+#
+#
+#
+#
+# def calculate_mole_percent(components):
+#     """ This function calculates the mole percents of the components entered, based on Burke (2001) EQ(2)
+#     """
+#     def partial_molec_contribution_single(A, sigma, squiggle):
+#         return A / (sigma * squiggle)
+#
+#     def partial_molec_contribution_double(A1, sigma1, A2, sigma2, squiggle):
+#         return (A1 + A2) / ((sigma1 + sigma2) * squiggle)
+#
+#     total_partials = 0
+#     partials = []
+#
+#     for component in components:
+#         if component['name'] == 'CO2':
+#             partial = partial_molec_contribution_double(component['peak_area_1'], component['cross_section_1'],
+#                                                        component['peak_area_2'], component['cross_section_2'],
+#                                                        component['efficiency'])
+#         else:
+#             partial = partial_molec_contribution_single(component['peak_area'], component['cross_section'],
+#                                                         component['efficiency'])
+#
+#         partials.append(partial)
+#         total_partials += partial
+#
+#     mole_percentages = [round((partial / total_partials) * 100, 1) for partial in partials]
+#
+#     mole_percent_dict = {component['name']: mole_percent for component, mole_percent in zip(components, mole_percentages)}
+#     mole_percent_dict['Mole_Percent_Sum'] = sum(mole_percentages)
+#
+#     return mole_percent_dict
+
+
+#
+#
+# def calculate_CO2_SO2_ratio(*, peak_area_SO2, peak_area_diad1, peak_area_diad2,wavelength=532.067, T_K=37+273.15,efficiency_SO2=1, efficiency_CO2=0.5, sigma_SO2=4.03, sigma_CO2_v1=0.8, sigma_CO2_v2=1.23):
+#
+#   # First we need to calculate the oarameters
+#
+#   component_dict = {
+#     "SO2": {"Peak_shift_cm-1": 1151, "Σ": sigma_SO2},
+#     "CO2_v1": {"Peak_shift_cm-1": 1285, "Σ": sigma_CO2_v1},
+#     "CO2_2v2": {"Peak_shift_cm-1": 1388, "Σ": sigma_CO2_v2}}
+# ### "Σ" is the wavelength independent relative cross-section
+#
+#   sigma_results = calculate_sigma(wavelength=wavelength, vi_dict=component_dict, T_K=T_K)
+#
+#     # Now lets allocate these calculations
+#   components = [
+#         {'name': 'SO2',
+#         'peak_area': peak_area_SO2,
+#         'cross_section':  sigma_results['SO2'],
+#         'efficiency': efficiency_SO2},
+#         {'name': 'CO2',
+#           'peak_area_1':peak_area_diad2, 'cross_section_1': sigma_results['CO2_2v2'],
+#         'peak_area_2': peak_area_diad1, 'cross_section_2': sigma_results['CO2_v1'], 'efficiency': efficiency_CO2}
+#     ]
+#   mol_perc=calculate_mole_percent(components)
+#
+#
+#   return pd.DataFrame(mol_perc)
 
 
 
@@ -180,4 +185,47 @@ def convert_cross_section_wavelength1_wavelength2(wavelength_nm_1,wavelength_nm_
 
    return dep_cross_sec
 
+def calculate_SO2_CO2_mol_prop_wave_indep(SO2_wavelength_ind, CO2_diad1_wavelength_ind, CO2_diad2_wavelength_ind, wavelength_nm, T_C,
+                               A_SO2, A_CO2_Tot):
+    """ Takes wavelength independnet cross sections and CO2 and SO2 peak areas and converts them into SO2 mol proportions
+    Parameters
+    ------------------
+
+    SO2_wavelength_ind: Wavelength independent cross section for SO2
+
+    CO2_diad1_wavelength_ind: Wavelength independent cross section for diad 1 (at 1285)
+
+    CO2_diad2_wavelength_ind: Wavelength independent cross section for diad 2 (at 1388)
+
+    wavelength_nm: Laser wavelenth of system in nm
+
+    T_C: Temperature of analysis in C.
+
+    Returns
+    ---------------
+
+    SO2 mol proportion
+
+
+    """
+
+    SO2_cross_sec=calculate_wavelength_dependent_cross_section(wavelength_nm=wavelength_nm, T_C=T_C, Raman_shift_cm=1151, wavelength_independent_cross_section=SO2_wavelength_ind)
+    CO2_diad1_xsec=calculate_wavelength_dependent_cross_section(wavelength_nm=wavelength_nm, T_C=T_C, Raman_shift_cm=1285, wavelength_independent_cross_section=CO2_diad1_wavelength_ind)
+    CO2_diad2_xsec=calculate_wavelength_dependent_cross_section(wavelength_nm=wavelength_nm, T_C=T_C, Raman_shift_cm=1388, wavelength_independent_cross_section=CO2_diad2_wavelength_ind)
+
+
+    SO2_prop=(A_SO2/SO2_cross_sec)/(A_CO2_Tot /(CO2_diad1_xsec + CO2_diad2_xsec) +  (A_SO2/SO2_cross_sec) )
+
+    return SO2_prop
+
+
+def calculate_SO2_CO2_ratio(SO2_area, diad1_area, diad2_area, SO2_cross_sec=5.3, diad1_cross_sec=0.89, diad2_cross_sec=1.4):
+    """ Calculates SO2:CO2 ratio using the parameters from Marie-Camille Caumons lab"""
+
+
+    A_CO2_star=( diad1_area + diad2_area)/(diad2_cross_sec+diad1_cross_sec)
+    A_SO2_star=(SO2_area)/(SO2_cross_sec)
+    Ratio=A_SO2_star/(A_SO2_star+A_CO2_star)
+
+    return Ratio
 

{DiadFit-1.0.8.dist-info → DiadFit-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DiadFit
-Version: 1.0.8
+Version: 1.0.9
 Summary: DiadFit
 Home-page: https://github.com/PennyWieser/DiadFit
 Author: Penny Wieser

{DiadFit-1.0.8.dist-info → DiadFit-1.0.9.dist-info}/RECORD

@@ -29,22 +29,22 @@ DiadFit/Mediumrho_polyfit_data_CCMR.pkl,sha256=U6ODSdurqS0-lynm1MG1zktg8NuhYRbrY
 DiadFit/Mediumrho_polyfit_data_CMASS.pkl,sha256=SBy1pIdqCAF9UtB9FLNTuD0-tFyD7swwJppdE2U_FsY,1557
 DiadFit/Psensor.py,sha256=C2xSlgxhUJIKIBDvUp02QaYRs5QsIqjGGRMP25ZLRZ0,10435
 DiadFit/__init__.py,sha256=F-HjhCYKL_U8PfiH8tZ9DUCkxPvo6lAslJS4fyvxkbY,1148
-DiadFit/_version.py,sha256=nKWaPgClU1xtZYZ6_YcxZaeEJaW2vSv3ADjLG6ofSoo,295
+DiadFit/_version.py,sha256=8wkWdIefAjvOQecKda3-TYv9_XiCz7EIQMvxj1kOrJA,295
 DiadFit/argon_lines.py,sha256=vtzsuDdEgrAmEF9xwpejpFqKV9hKPS1JUYhIl4AfXZ0,7675
 DiadFit/cosmicray_filter.py,sha256=a45x2_nmpi9Qcjc_L39UA9JOd1NMorIjtTRGnCdG3MU,23634
-DiadFit/densimeter_fitting.py,sha256=zEyCwq1zDV3z6-MIu-eZqgp3YQPUGqwZiKczN3-22LQ,8247
-DiadFit/densimeters.py,sha256=pSD8s9_9949bjWTbXU6SwoNgvsVBKGfQVf-JYMMtjrs,55282
+DiadFit/densimeter_fitting.py,sha256=AV5jWHSuIuN-e61chwMiTETa26pQo5drEGorYTkceHo,8308
+DiadFit/densimeters.py,sha256=J4DnQgavhkDKOaBTQqqShepZVeH5jxJiT1FmebmLY88,55282
 DiadFit/density_depth_crustal_profiles.py,sha256=Vvtw3-_xuWIYEuhuDzXstkprluXyBkUcdm9iP7qBwyQ,19754
-DiadFit/diads.py,sha256=lv6u9m71850_UnPqAOdFFeITMx5b0Dhn21i8tpDWj_Q,180939
+DiadFit/diads.py,sha256=gwHWTquJeoJaBYEYjJcJct38j6Bi-GUUsFCPsFgCFzU,179483
 DiadFit/error_propagation.py,sha256=ZN9EspONh_vUGxBHxxWNkYskKqFMRvJMNr2h2RXv-54,50624
 DiadFit/importing_data_files.py,sha256=j7cSEPZ6iKmYnSqYEIcCl7YNdqqkCD56W-4V9T2oWOE,52010
 DiadFit/lookup_table.csv,sha256=Hs1tmSQ9ArTUDv3ymEXbvnLlPBxYUP0P51dz7xAKk-Q,2946857
 DiadFit/lookup_table_noneg.csv,sha256=HelvewKbBy4cqT2GAqsMo-1ps1lBYqZ-8hCJZWPGfhI,3330249
-DiadFit/molar_gas_proportions.py,sha256=mEcseIBFim5K7--9F0QwMT0QHin8Ubnm9U9iMSp7bI8,7337
+DiadFit/molar_gas_proportions.py,sha256=3zc5t037L11w_hCYJqV4Xp4NwVCmGb3gMp1McAhV0TM,9315
 DiadFit/ne_lines.py,sha256=KR1s33pZB_O8e3irtDLdBpepGwUjxWudjJNyHyXqfbg,63980
 DiadFit/relaxfi_PW.py,sha256=vXXW9JjEBRf0UR9p-DJLx8j4Z2ePpUDweoAok-2nMJ0,32119
 DiadFit/relaxifi.py,sha256=DSHAUP0tnkiMrHQgQPBK-9P3cWYmegURKzYOUgdAlos,38569
-DiadFit-1.0.8.dist-info/METADATA,sha256=reLyXTzuAFqhm7f93wEwig0vQpWQxqgAK0w62Ehq3gQ,1171
-DiadFit-1.0.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-DiadFit-1.0.8.dist-info/top_level.txt,sha256=yZC6OFLVznaFA5kcPlFPkvhKotcVd-YO4bKxZZw3LQE,8
-DiadFit-1.0.8.dist-info/RECORD,,
+DiadFit-1.0.9.dist-info/METADATA,sha256=8cAHxsD398JkFantbqsbVF1BMvHOes3KgsTkvCBjRWE,1171
+DiadFit-1.0.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+DiadFit-1.0.9.dist-info/top_level.txt,sha256=yZC6OFLVznaFA5kcPlFPkvhKotcVd-YO4bKxZZw3LQE,8
+DiadFit-1.0.9.dist-info/RECORD,,