DiadFit 0.0.88__tar.gz → 0.0.90__tar.gz

{DiadFit-0.0.88 → DiadFit-0.0.90}/PKG-INFO

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

{DiadFit-0.0.88 → DiadFit-0.0.90}/src/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__ = '0.0.88'
+__version__ = '0.0.90'

{DiadFit-0.0.88 → DiadFit-0.0.90}/src/DiadFit/densimeters.py

@@ -512,6 +512,7 @@ CI_split=0.67, CI_neon=0.67,  Ne_pickle_str=None, pref_Ne=None, Ne_err=None, cor
 
     # IF temp is 37
     if lab=='CMASS' and temp=='SupCrit':
+        print('yes')
         # This gets the densimeter at low density
         pickle_str_lowr='Lowrho_polyfit_data_CMASS.pkl'
         with open(DiadFit_dir/pickle_str_lowr, 'rb') as f:
@@ -529,7 +530,7 @@ CI_split=0.67, CI_neon=0.67,  Ne_pickle_str=None, pref_Ne=None, Ne_err=None, cor
             
     
             
-    if lab=='CMASS' and temp=='RoomT':
+    elif lab=='CMASS' and temp=='RoomT':
         # This gets the densimeter at low density
         pickle_str_lowr='Lowrho_polyfit_data_CMASS_24C.pkl'
         with open(DiadFit_dir/pickle_str_lowr, 'rb') as f:

{DiadFit-0.0.88 → DiadFit-0.0.90}/src/DiadFit/diads.py

@@ -5,6 +5,8 @@ from matplotlib import patches
 import lmfit
 from lmfit.models import GaussianModel, VoigtModel, LinearModel, ConstantModel, PseudoVoigtModel, Pearson4Model
 from scipy.signal import find_peaks
+from scipy.signal.windows import gaussian
+
 import os
 import re
 from os import listdir

{DiadFit-0.0.88 → DiadFit-0.0.90}/src/DiadFit/error_propagation.py

@@ -275,7 +275,7 @@ error_XH2O=None, error_type_XH2O='Abs', error_dist_XH2O='normal',
     # First need to work out what crustal density is
 
     if type(crust_dens_kgm3) is float or type(crust_dens_kgm3) is int:
-        crust_dens_with_noise=add_noise_to_variable(crust_dens_kgm3, error_crust_dens_kgm3,
+        crust_dens_with_noise=add_noise_to_variable(crust_dens_kgm3, error_crust_dens,
         error_type_crust_dens, error_dist_crust_dens,  N_dup, neg_values, neg_threshold=0.0000000001)
         
 
@@ -694,13 +694,53 @@ neg_values=True
         
         
         fig.suptitle('Simulations for sample = ' + str(All_outputs['Filename'].iloc[fig_i]), fontsize=20)
+        
+        # Getting things to annotate
+        # Temperature 
+        if isinstance(error_T_K, pd.Series):
+            error_T_K_plot = error_T_K.iloc[fig_i]
+        elif isinstance(error_T_K, np.ndarray):
+            error_T_K_plot = error_T_K[fig_i]
+        else:
+            error_T_K_plot = error_T_K
+        error_T_K_plot=np.round(error_T_K_plot, 1)
+        
+        
+        # Crustal density 
+        if isinstance(error_crust_dens, pd.Series):
+            error_crust_dens_plot = error_crust_dens.iloc[fig_i]
+        elif isinstance(error_crust_dens, np.ndarray):
+            error_crust_dens_plot = error_crust_dens[fig_i]
+        else:
+            error_crust_dens_plot = error_crust_dens
+        error_crust_dens_plot=np.round(error_crust_dens_plot, 1)
+            
+        # CO2 density
+        if isinstance(error_CO2_dens, pd.Series):
+            error_CO2_dens_plot = error_CO2_dens.iloc[fig_i]
+        elif isinstance(error_CO2_dens, np.ndarray):
+            error_CO2_dens_plot = error_CO2_dens[fig_i]
+        else:
+            error_CO2_dens_plot = error_CO2_dens
+        error_CO2_dens_plot=np.round(error_CO2_dens_plot, 3)
+            
+            
+        # XH2O 
+        if isinstance(error_XH2O, pd.Series):
+            error_XH2O_plot = error_XH2O.iloc[fig_i]
+        elif isinstance(error_XH2O, np.ndarray):
+            error_XH2O_plot = error_XH2O[fig_i]
+        else:
+            error_XH2O_plot = error_XH2O
+        error_XH2O_plot=np.round(error_XH2O_plot, 3)
+    
 
 
         # Ax1 is temperature
         if error_dist_T_K=='normal' and error_type_T_K == 'Abs':
-            ax1.set_title('Input distribution Temp: Normally-distributed, 1σ =' +str(error_T_K) + ' K')
+            ax1.set_title('Input distribution Temp: Normally-distributed, 1σ =' +str(error_T_K_plot) + ' K')
         if error_dist_T_K=='normal' and error_type_T_K == 'Perc':
-            ax1.set_title('Input distribution Temp: Normally-distributed, 1σ =' +str(error_T_K) + '%')
+            ax1.set_title('Input distribution Temp: Normally-distributed, 1σ =' +str(error_T_K_plot) + '%')
         if df_1_step['error_T_K'][0]!=0:
             ax1.hist(df_1_sample['MC_T_K'], color='red',  ec='k')
         else:
@@ -708,9 +748,9 @@ neg_values=True
             
         # ax2 is CO2 density
         if error_dist_CO2_dens=='normal' and error_type_CO2_dens == 'Abs':
-            ax2.set_title('Input distribution CO$_2$ density: Normally-distributed, 1σ =' +str(error_CO2_dens) + ' g/cm$^{3}$')
+            ax2.set_title('Input distribution CO$_2$ density: Normally-distributed, 1σ =' +str(error_CO2_dens_plot) + ' g/cm$^{3}$')
         if error_dist_CO2_dens=='normal' and error_type_CO2_dens == 'Perc':
-            ax2.set_title('Input distribution CO$_2$ density: Normally-distributed, 1σ =' +str(error_CO2_dens) + '%')
+            ax2.set_title('Input distribution CO$_2$ density: Normally-distributed, 1σ =' +str(error_CO2_dens_plot) + '%')
         if df_1_step['error_CO2_dens_gcm3'][0]!=0:
             ax2.hist(df_1_sample['MC_CO2_dens_gcm3'], facecolor='white',  ec='k')
         else:
@@ -719,9 +759,9 @@ neg_values=True
         
         # ax3 is the crustal density error
         if error_dist_crust_dens=='normal' and error_type_crust_dens == 'Abs':
-            ax3.set_title('Input Distribution Crustal density: Normally-distributed, 1σ =' +str(error_crust_dens) + 'kg/m$^{3}$')
+            ax3.set_title('Input Distribution Crustal density: Normally-distributed, 1σ =' +str(error_crust_dens_plot) + 'kg/m$^{3}$')
         if error_dist_crust_dens=='normal' and error_type_crust_dens == 'Perc':
-            ax3.set_title('Input distribution crustal density: Normally-distributed, 1σ =' +str(error_crust_dens) + '%')
+            ax3.set_title('Input distribution crustal density: Normally-distributed, 1σ =' +str(error_crust_dens_plot) + '%')
         if model is None and df_1_step['error_crust_dens_kgm3'][0]!=0:
             ax3.hist(df_1_sample['input_crust_dens_kgm3'], facecolor='white',  ec='k')
         else:
@@ -730,9 +770,9 @@ neg_values=True
             
         # ax4 is XH2O
         if error_dist_XH2O=='normal' and error_type_XH2O == 'Abs':
-            ax4.set_title('Input Distribution XH2O: Normally-distributed, 1σ =' +str(error_XH2O) + 'molar prop')
+            ax4.set_title('Input Distribution XH2O: Normally-distributed, 1σ =' +str(error_XH2O_plot) + 'molar prop')
         if error_dist_XH2O=='normal' and error_type_XH2O == 'Perc':
-            ax4.set_title('Input distribution XH2O: Normally-distributed, 1σ =' +str(error_XH2O) + '%')
+            ax4.set_title('Input distribution XH2O: Normally-distributed, 1σ =' +str(error_XH2O_plot) + '%')
         if XH2O is not None and df_1_step['error_XH2O'][0]!=0:
             ax4.hist(df_1_sample['MC_XH2O'], facecolor='white',  ec='k')
         else:

{DiadFit-0.0.88 → DiadFit-0.0.90}/src/DiadFit.egg-info/PKG-INFO

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