ararpy 0.1.197__tar.gz → 0.1.198__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 (74) hide show
  1. {ararpy-0.1.197 → ararpy-0.1.198}/PKG-INFO +1 -1
  2. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/__init__.py +1 -1
  3. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/age.py +0 -2
  4. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/initial.py +4 -4
  5. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/sample.py +5 -5
  6. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy.egg-info/PKG-INFO +1 -1
  7. {ararpy-0.1.197 → ararpy-0.1.198}/setup.py +1 -1
  8. {ararpy-0.1.197 → ararpy-0.1.198}/LICENSE +0 -0
  9. {ararpy-0.1.197 → ararpy-0.1.198}/README.md +0 -0
  10. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/__init__.py +0 -0
  11. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/arr.py +0 -0
  12. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/basic.py +0 -0
  13. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/corr.py +0 -0
  14. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/err.py +0 -0
  15. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/histogram.py +0 -0
  16. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/isochron.py +0 -0
  17. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/jvalue.py +0 -0
  18. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/plot.py +0 -0
  19. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/raw_funcs.py +0 -0
  20. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/regression.py +0 -0
  21. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/spectra.py +0 -0
  22. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/022_VU124-M11a.ahd +0 -0
  23. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/20WHA0103.age +0 -0
  24. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/22WHA0078.xls +0 -0
  25. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/22WHA0433.age +0 -0
  26. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/22WHA0433.arr +0 -0
  27. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/22WHA0433.full.xls +0 -0
  28. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/24WHN0001-51-592.XLS +0 -0
  29. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/AHD.input-filter +0 -0
  30. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/ArAr.calc +0 -0
  31. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/ArArCALC.age +0 -0
  32. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/NGX-600 - Copy.TXT +0 -0
  33. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/NGX-600.TXT +0 -0
  34. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/NGX-XLS.input-filter +0 -0
  35. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/Qtegra-exported-xls.input-filter +0 -0
  36. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/S01-239.csv +0 -0
  37. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/WH01.irra +0 -0
  38. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/WHA.pdf +0 -0
  39. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/raw_example.xls +0 -0
  40. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/examples/sample-default.smp +0 -0
  41. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/__init__.py +0 -0
  42. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/arr_file.py +0 -0
  43. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/basic.py +0 -0
  44. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/calc_file.py +0 -0
  45. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/new_file.py +0 -0
  46. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/raw_file.py +0 -0
  47. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/xls.py +0 -0
  48. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/EXPORT_TO_PDF_DATA_PROPERTIES.py +0 -0
  49. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/__init__.py +0 -0
  50. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/basic.py +0 -0
  51. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/calculation.py +0 -0
  52. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/consts.py +0 -0
  53. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/corr.py +0 -0
  54. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/diffusion_funcs.py +0 -0
  55. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/export.py +0 -0
  56. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/info.py +0 -0
  57. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/json.py +0 -0
  58. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/plots.py +0 -0
  59. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/raw.py +0 -0
  60. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/style.py +0 -0
  61. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/table.py +0 -0
  62. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/test.py +0 -0
  63. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/thermo/__init__.py +0 -0
  64. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/thermo/arrhenius.py +0 -0
  65. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/thermo/atomic_level_random_walk.py +0 -0
  66. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy/thermo/basic.py +0 -0
  67. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy.egg-info/SOURCES.txt +0 -0
  68. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy.egg-info/dependency_links.txt +0 -0
  69. {ararpy-0.1.197 → ararpy-0.1.198}/ararpy.egg-info/top_level.txt +0 -0
  70. {ararpy-0.1.197 → ararpy-0.1.198}/setup.cfg +0 -0
  71. {ararpy-0.1.197 → ararpy-0.1.198}/tests/test.py +0 -0
  72. {ararpy-0.1.197 → ararpy-0.1.198}/tests/test2.py +0 -0
  73. {ararpy-0.1.197 → ararpy-0.1.198}/tests/test_error_correlation.py +0 -0
  74. {ararpy-0.1.197 → ararpy-0.1.198}/tests/test_regression_methods.py +0 -0
{ararpy-0.1.197 → ararpy-0.1.198}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ararpy
3
- Version: 0.1.197
3
+ Version: 0.1.198
4
4
  Summary: A project for Ar-Ar geochronology
5
5
  Home-page: https://github.com/wuyangchn/ararpy.git
6
6
  Author: Yang Wu
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/__init__.py RENAMED
@@ -16,7 +16,7 @@ from . import calc, smp, files, thermo, test
16
16
  """ Information """
17
17
 
18
18
  name = 'ararpy'
19
- version = '0.1.197'
19
+ version = '0.1.198'
20
20
  __version__ = version
21
21
  full_version = version
22
22
  last_update = '2024-03-28'
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/age.py RENAMED
@@ -67,8 +67,6 @@ def calc_age_min(F, sF, **kwargs) -> tuple:
67
67
  # Kp = arr.array_as_float(kwargs.pop('Kp'))
68
68
  # sKp = arr.array_as_float(kwargs.pop('sKp') * Kp / 100)
69
69
 
70
- print(f"{t = }, {st = }")
71
-
72
70
  # recalculation using Min et al.(2000) equation
73
71
  # lmd = A * W * Y / (f * No)
74
72
  V = f * No / ((Ab + Ae) * W * Y)
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/initial.py RENAMED
@@ -296,13 +296,13 @@ def check_version(smp: Sample):
296
296
  # 20250404
297
297
  doNormalize = True
298
298
  v, sv = [], []
299
- if smp.Info.sample.type.lower() != "unknown":
299
+ if smp.Info.sample.type.lower() == "unknown":
300
300
  v, sv = smp.TotalParam[67:69]
301
301
  sv = np.multiply(v, sv) / 100
302
- elif smp.Info.sample.type.lower() != "air":
303
- v, sv = smp.TotalParam[95:97]
302
+ elif smp.Info.sample.type.lower() == "air":
303
+ v, sv = smp.TotalParam[93:95]
304
304
  sv = np.multiply(v, sv) / 100
305
- elif smp.Info.sample.type.lower() != "standard":
305
+ elif smp.Info.sample.type.lower() == "standard":
306
306
  v, sv = smp.TotalParam[59:61]
307
307
  smp.NormalizeFactor = [
308
308
  [1 if v[0] == each or not doNormalize else v[0] / each for each in v],
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/sample.py RENAMED
@@ -108,12 +108,12 @@ TOTAL_PARAMS_HEADERS = [
108
108
  'Decay Activity \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3', # 54-55
109
109
  'Decay Activity \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3', # 56-57
110
110
  '\u00B3\u2076Cl/\u00B3\u2078Cl Productivity', '%1\u03C3', # 58-59
111
- 'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',
112
- '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3', # 60-68
111
+ 'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3', # 60-66
112
+ '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3', # 67-68
113
113
  'J', '%1\u03C3', 'MDF', '%1\u03C3', # 69-72
114
- 'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',
115
- 'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',
116
- 'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3', # 73-84
114
+ 'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3', # 73-76
115
+ 'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3', # 77-80
116
+ 'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3', # 81-84
117
117
  'No', '%1\u03C3', 'Year', '%1\u03C3', '\u2074\u2070K/K', '%1\u03C3',
118
118
  '\u00B3\u2075Cl/\u00B3\u2077Cl', '%1\u03C3', 'HCl/Cl', '%1\u03C3', # 85-94
119
119
  '\u2074\u2070Ar/\u00B3\u2076Ar air', '%1\u03C3', # 95-96
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ararpy
3
- Version: 0.1.197
3
+ Version: 0.1.198
4
4
  Summary: A project for Ar-Ar geochronology
5
5
  Home-page: https://github.com/wuyangchn/ararpy.git
6
6
  Author: Yang Wu
{ararpy-0.1.197 → ararpy-0.1.198}/setup.py RENAMED
@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
16
16
 
17
17
  setuptools.setup(
18
18
  name='ararpy', #
19
- version='0.1.197', # version
19
+ version='0.1.198', # version
20
20
  author='Yang Wu',
21
21
  author_email='wuycug@hotmail.com',
22
22
  description='A project for Ar-Ar geochronology', # short description
{ararpy-0.1.197 → ararpy-0.1.198}/LICENSE RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/README.md RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/arr.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/basic.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/corr.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/err.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/jvalue.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/calc/plot.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/basic.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/files/xls.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/basic.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/consts.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/corr.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/export.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/info.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/json.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/plots.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/raw.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/style.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/smp/table.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/ararpy/test.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/setup.cfg RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/tests/test.py RENAMED
File without changes
{ararpy-0.1.197 → ararpy-0.1.198}/tests/test2.py RENAMED
File without changes