DiadFit 0.0.83__tar.gz → 0.0.84__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. {DiadFit-0.0.83 → DiadFit-0.0.84}/PKG-INFO +1 -1
  2. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/_version.py +1 -1
  3. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/error_propagation.py +11 -2
  4. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit.egg-info/PKG-INFO +1 -1
  5. {DiadFit-0.0.83 → DiadFit-0.0.84}/README.md +0 -0
  6. {DiadFit-0.0.83 → DiadFit-0.0.84}/setup.cfg +0 -0
  7. {DiadFit-0.0.83 → DiadFit-0.0.84}/setup.py +0 -0
  8. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/CO2_EOS.py +0 -0
  9. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/CO2_H2O_EOS.py +0 -0
  10. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/CO2_in_bubble_error.py +0 -0
  11. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/H2O_fitting.py +0 -0
  12. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Highrho_polyfit_data.pkl +0 -0
  13. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Highrho_polyfit_dataUCB_1117_1400.pkl +0 -0
  14. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Highrho_polyfit_dataUCB_1220_1400.pkl +0 -0
  15. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Highrho_polyfit_dataUCB_1220_1447.pkl +0 -0
  16. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Highrho_polyfit_data_CCMR.pkl +0 -0
  17. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Highrho_polyfit_data_CMASS.pkl +0 -0
  18. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Lowrho_polyfit_data.pkl +0 -0
  19. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Lowrho_polyfit_dataUCB_1117_1400.pkl +0 -0
  20. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Lowrho_polyfit_dataUCB_1220_1400.pkl +0 -0
  21. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Lowrho_polyfit_dataUCB_1220_1447.pkl +0 -0
  22. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Lowrho_polyfit_data_CCMR.pkl +0 -0
  23. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Lowrho_polyfit_data_CMASS.pkl +0 -0
  24. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Mediumrho_polyfit_data.pkl +0 -0
  25. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Mediumrho_polyfit_dataUCB_1117_1400.pkl +0 -0
  26. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Mediumrho_polyfit_dataUCB_1220_1400.pkl +0 -0
  27. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Mediumrho_polyfit_dataUCB_1220_1447.pkl +0 -0
  28. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Mediumrho_polyfit_data_CCMR.pkl +0 -0
  29. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Mediumrho_polyfit_data_CMASS.pkl +0 -0
  30. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/Psensor.py +0 -0
  31. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/__init__.py +0 -0
  32. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/argon_lines.py +0 -0
  33. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/cosmicray_filter.py +0 -0
  34. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/densimeter_fitting.py +0 -0
  35. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/densimeters.py +0 -0
  36. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/density_depth_crustal_profiles.py +0 -0
  37. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/diads.py +0 -0
  38. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/importing_data_files.py +0 -0
  39. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/molar_gas_proportions.py +0 -0
  40. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/ne_lines.py +0 -0
  41. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/relaxifi.py +0 -0
  42. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit.egg-info/SOURCES.txt +0 -0
  43. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit.egg-info/dependency_links.txt +0 -0
  44. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit.egg-info/requires.txt +0 -0
  45. {DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit.egg-info/top_level.txt +0 -0
{DiadFit-0.0.83 → DiadFit-0.0.84}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: DiadFit
3
- Version: 0.0.83
3
+ Version: 0.0.84
4
4
  Summary: DiadFit
5
5
  Home-page: https://github.com/PennyWieser/DiadFit
6
6
  Author: Penny Wieser
{DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/_version.py RENAMED
@@ -5,4 +5,4 @@
5
5
  # 1) we don't load dependencies by storing it in __init__.py
6
6
  # 2) we can import it in setup.py for the same reason
7
7
  # 3) we can import it into your module
8
- __version__ = '0.0.83'
8
+ __version__ = '0.0.84'
{DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/error_propagation.py RENAMED
@@ -289,11 +289,13 @@ error_XH2O=None, error_type_XH2O='Abs', error_dist_XH2O='normal',
289
289
  if XH2O is None:
290
290
  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):
291
291
  df_c=pd.DataFrame(data={'T_K': T_K,
292
- 'CO2_dens_gcm3': CO2_dens_gcm3})
292
+ 'CO2_dens_gcm3': CO2_dens_gcm3,
293
+ 'XH2O': 0})
293
294
  else:
294
295
  #print('here')
295
296
  df_c=pd.DataFrame(data={'T_K': T_K,
296
- 'CO2_dens_gcm3': CO2_dens_gcm3}, index=[0])
297
+ 'CO2_dens_gcm3': CO2_dens_gcm3,
298
+ 'XH2O': 0}, index=[0])
297
299
  # IF have XH2O add here
298
300
  else:
299
301
  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',
355
357
  XH2O_with_noise=Noise_to_add_XH2O+df_c['XH2O'].iloc[sample_i]
356
358
  XH2O_with_noise[XH2O_with_noise < 0.000000] = 0.00000
357
359
  XH2O_with_noise[XH2O_with_noise > 1] = 1
360
+
361
+
358
362
 
359
363
 
360
364
 
@@ -412,6 +416,11 @@ error_XH2O=None, error_type_XH2O='Abs', error_dist_XH2O='normal',
412
416
  df_out['XH2O_with_noise']=XH2O_with_noise
413
417
  df_out['error_type_XH2O']=error_type_XH2O
414
418
  df_out['error_dist_XH2O']=error_dist_XH2O
419
+ else:
420
+ df_out['error_XH2O']=0
421
+ df_out['XH2O_with_noise']=0
422
+
423
+
415
424
 
416
425
 
417
426
 
{DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: DiadFit
3
- Version: 0.0.83
3
+ Version: 0.0.84
4
4
  Summary: DiadFit
5
5
  Home-page: https://github.com/PennyWieser/DiadFit
6
6
  Author: Penny Wieser
{DiadFit-0.0.83 → DiadFit-0.0.84}/README.md RENAMED
File without changes
{DiadFit-0.0.83 → DiadFit-0.0.84}/setup.cfg RENAMED
File without changes
{DiadFit-0.0.83 → DiadFit-0.0.84}/setup.py RENAMED
File without changes
{DiadFit-0.0.83 → DiadFit-0.0.84}/src/DiadFit/diads.py RENAMED
File without changes