DiadFit 0.0.83__py3-none-any.whl → 0.0.84__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__ = '0.0.83'
+__version__ = '0.0.84'

DiadFit/error_propagation.py

@@ -289,11 +289,13 @@ error_XH2O=None, error_type_XH2O='Abs', error_dist_XH2O='normal',
     if XH2O is None:
         if isinstance(T_K, pd.Series) or isinstance(CO2_dens_gcm3, pd.Series) or isinstance(T_K, np.ndarray) or isinstance(CO2_dens_gcm3, np.ndarray):
             df_c=pd.DataFrame(data={'T_K': T_K,
-                                'CO2_dens_gcm3': CO2_dens_gcm3})
+                                'CO2_dens_gcm3': CO2_dens_gcm3,
+                                'XH2O': 0})
         else:
             #print('here')
             df_c=pd.DataFrame(data={'T_K': T_K,
-                                'CO2_dens_gcm3': CO2_dens_gcm3}, index=[0])
+                                'CO2_dens_gcm3': CO2_dens_gcm3,
+                                'XH2O': 0}, index=[0])
     # IF have XH2O add here
     else:
         if isinstance(T_K, pd.Series) or isinstance(CO2_dens_gcm3, pd.Series) or isinstance(T_K, np.ndarray) or isinstance(CO2_dens_gcm3, np.ndarray) or isinstance(XH2O, np.ndarray):
@@ -355,6 +357,8 @@ error_XH2O=None, error_type_XH2O='Abs', error_dist_XH2O='normal',
         XH2O_with_noise=Noise_to_add_XH2O+df_c['XH2O'].iloc[sample_i]
         XH2O_with_noise[XH2O_with_noise < 0.000000] = 0.00000
         XH2O_with_noise[XH2O_with_noise > 1] = 1
+
+        
             
     
     
@@ -412,6 +416,11 @@ error_XH2O=None, error_type_XH2O='Abs', error_dist_XH2O='normal',
         df_out['XH2O_with_noise']=XH2O_with_noise
         df_out['error_type_XH2O']=error_type_XH2O
         df_out['error_dist_XH2O']=error_dist_XH2O
+    else:
+        df_out['error_XH2O']=0
+        df_out['XH2O_with_noise']=0
+
+        
 
 
 

{DiadFit-0.0.83.dist-info → DiadFit-0.0.84.dist-info}/METADATA

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

{DiadFit-0.0.83.dist-info → DiadFit-0.0.84.dist-info}/RECORD

@@ -22,19 +22,19 @@ 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=wXZHfLvkI9ye1TFrdykATP8Kn7I-UdNFBTmHZI1V9EQ,1181
-DiadFit/_version.py,sha256=DFP-v4yXstVML_Tz4leqt2XLD-wwNVic6dvx_axCDcs,296
+DiadFit/_version.py,sha256=_gSOI4by-6mg99lrNTeG1MjAQA3GkHtFuda3Et9gMvY,296
 DiadFit/argon_lines.py,sha256=vtzsuDdEgrAmEF9xwpejpFqKV9hKPS1JUYhIl4AfXZ0,7675
 DiadFit/cosmicray_filter.py,sha256=a45x2_nmpi9Qcjc_L39UA9JOd1NMorIjtTRGnCdG3MU,23634
 DiadFit/densimeter_fitting.py,sha256=Uel9a4qUVz6r-my09uuHFRjD9oPFF-kd5ZBPYfYfOQM,8086
 DiadFit/densimeters.py,sha256=e5C-SLGG3hAQA3041ayyVI6INlb9KCCOkvoFr8mM_Ek,49419
 DiadFit/density_depth_crustal_profiles.py,sha256=XPauKf62hMp-iw701XfphaVe3o6LRJSwuQXAcSDXv6s,16983
 DiadFit/diads.py,sha256=l2JagWCPZjkU4MpNw03wNB8z0BRwInJNP92tbKsqDPo,175013
-DiadFit/error_propagation.py,sha256=URP8V4gKonk2GWWZIuzNqNFXXMj12QSLIw6S6B4niaM,41268
+DiadFit/error_propagation.py,sha256=yOMl8KTLu2YPCOf5XfctatX4iwL6eaQVagfW8gXRDI4,41451
 DiadFit/importing_data_files.py,sha256=SUpjk2cm2zGhyUEimib2MnaNAzMVo99uf3N5IKSWl8Q,39312
 DiadFit/molar_gas_proportions.py,sha256=_oEZn_vndHGDaXAjZ6UU8ycujBx_qB2KGCGqZSzotQU,3389
 DiadFit/ne_lines.py,sha256=njHOFritpIxfIeVjRHv0o0p9nqM-gKVNcIOD3BSCHhg,62437
 DiadFit/relaxifi.py,sha256=hHzRsJPQIVohYi3liy9IQJpaomgsa2zbLQmhqkpdfrI,31549
-DiadFit-0.0.83.dist-info/METADATA,sha256=YX512jNBmNd0o5_MqGOkLB5nSaGBBHvz10WxhN_GrMQ,1170
-DiadFit-0.0.83.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-DiadFit-0.0.83.dist-info/top_level.txt,sha256=yZC6OFLVznaFA5kcPlFPkvhKotcVd-YO4bKxZZw3LQE,8
-DiadFit-0.0.83.dist-info/RECORD,,
+DiadFit-0.0.84.dist-info/METADATA,sha256=XW5UKabQhBVgoQK--ZdGQnlB_-atKcuNIvGc6d7o1FA,1170
+DiadFit-0.0.84.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+DiadFit-0.0.84.dist-info/top_level.txt,sha256=yZC6OFLVznaFA5kcPlFPkvhKotcVd-YO4bKxZZw3LQE,8
+DiadFit-0.0.84.dist-info/RECORD,,