ararpy 0.1.197__py3-none-any.whl → 0.1.198__py3-none-any.whl

ararpy/__init__.py

@@ -16,7 +16,7 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.197'
+version = '0.1.198'
 __version__ = version
 full_version = version
 last_update = '2024-03-28'

ararpy/calc/age.py

@@ -67,8 +67,6 @@ def calc_age_min(F, sF, **kwargs) -> tuple:
     # Kp = arr.array_as_float(kwargs.pop('Kp'))
     # sKp = arr.array_as_float(kwargs.pop('sKp') * Kp / 100)
 
-    print(f"{t = }, {st = }")
-
     # recalculation using Min et al.(2000) equation
     # lmd = A * W * Y / (f * No)
     V = f * No / ((Ab + Ae) * W * Y)

ararpy/smp/initial.py

@@ -296,13 +296,13 @@ def check_version(smp: Sample):
     # 20250404
     doNormalize = True
     v, sv = [], []
-    if smp.Info.sample.type.lower() != "unknown":
+    if smp.Info.sample.type.lower() == "unknown":
         v, sv = smp.TotalParam[67:69]
         sv = np.multiply(v, sv) / 100
-    elif smp.Info.sample.type.lower() != "air":
-        v, sv = smp.TotalParam[95:97]
+    elif smp.Info.sample.type.lower() == "air":
+        v, sv = smp.TotalParam[93:95]
         sv = np.multiply(v, sv) / 100
-    elif smp.Info.sample.type.lower() != "standard":
+    elif smp.Info.sample.type.lower() == "standard":
         v, sv = smp.TotalParam[59:61]
     smp.NormalizeFactor = [
         [1 if v[0] == each or not doNormalize else v[0] / each for each in v],

ararpy/smp/sample.py

@@ -108,12 +108,12 @@ TOTAL_PARAMS_HEADERS = [
     'Decay Activity \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 54-55
     'Decay Activity \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 56-57
     '\u00B3\u2076Cl/\u00B3\u2078Cl Productivity', '%1\u03C3',  # 58-59
-    'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',
-    '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3',  # 60-68
+    'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',  # 60-66
+    '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3',  # 67-68
     'J', '%1\u03C3', 'MDF', '%1\u03C3',  # 69-72
-    'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',
-    'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',
-    'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3',  # 73-84
+    'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',  # 73-76
+    'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',  # 77-80
+    'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3',  # 81-84
     'No', '%1\u03C3', 'Year', '%1\u03C3', '\u2074\u2070K/K', '%1\u03C3',
     '\u00B3\u2075Cl/\u00B3\u2077Cl', '%1\u03C3', 'HCl/Cl', '%1\u03C3',  # 85-94
     '\u2074\u2070Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 95-96

{ararpy-0.1.197.dist-info → ararpy-0.1.198.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.1.197
+Version: 0.1.198
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.1.197.dist-info → ararpy-0.1.198.dist-info}/RECORD

@@ -1,7 +1,7 @@
-ararpy/__init__.py,sha256=8plcttpvAfTMr8fz0s7MHbFPgXcSoPKBQySFBrr4q1c,6858
+ararpy/__init__.py,sha256=KuOq5AHFop6-vXAxzRPNdbs-J0E6SewFZQsVVh9ICtM,6858
 ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
 ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
-ararpy/calc/age.py,sha256=mNHsW41vCarKnVqP1s79XWIAAYZjtDEQhsCk0AX2mAA,5817
+ararpy/calc/age.py,sha256=OcStt55LoYW1brs7a5_Ovv1NUSR5uZVQHDVGGmA_Pqg,5784
 ararpy/calc/arr.py,sha256=fe_nCo5zjD8HK9jNIsKXmsRKZ73GMipKK7dogVk5Ubk,15152
 ararpy/calc/basic.py,sha256=uJCCUFaPd9zvfkggrdbFYSGLl2pt7UJ7ENgXanzHy68,4036
 ararpy/calc/corr.py,sha256=Ps_AYgHSYjJNfb1PgPoYBa5eGc6eT9KLIiIiP0Q81as,18725
@@ -48,19 +48,19 @@ ararpy/smp/corr.py,sha256=ZS9hlRkBYhtuyT7HovEYIjBWBTLkHqJuQzT0vN4GNwg,26503
 ararpy/smp/diffusion_funcs.py,sha256=4-PMMIZWzjk2HOYYWNgSp4GmApygp1MmOxJ2g3xrqWc,175049
 ararpy/smp/export.py,sha256=s89L5B1aHoCeJIjcw6nXA6NtV0j_5XXaWnOETWnomCs,115043
 ararpy/smp/info.py,sha256=iKUELm-BuUduDlJKC1d8tKKNHbwwbNmhUg2pi6bcBvA,489
-ararpy/smp/initial.py,sha256=xaKQHEiOv-pS6U3CtVqhXopyFm8vBEr3VFqQnpBZAu0,16929
+ararpy/smp/initial.py,sha256=M1B5ytLAMzdU1IZ5mQMHFi1t4tx7FNj7fVhqM1AKntc,16929
 ararpy/smp/json.py,sha256=BTZCjVN0aj9epc700nwkYEYMKN2lHBYo-pLmtnz5oHY,2300
 ararpy/smp/plots.py,sha256=mF2ORen2KcPMkWkq-98-2QocmCeA2oJrwT6V_-4cAlE,32495
 ararpy/smp/raw.py,sha256=51n-rrbW2FqeZHQyevuG7iObPLGvIBzTe414QDVM1FE,6523
-ararpy/smp/sample.py,sha256=FGJ98J_bZr4QY7q3i8VMY_NJKjP83KvhYaIRVLqKcRU,55970
+ararpy/smp/sample.py,sha256=rDaTPHnd0-jMZ1YA-stjc9ghi9OrNyDCULjivKTPMew,55997
 ararpy/smp/style.py,sha256=Z4exOAdtvw5xwDf6nyIjPxuvww2U5JK6H_Ql02DBSyM,7030
 ararpy/smp/table.py,sha256=9bNAOqAIOc0nSC3LNeqjJKUYSJSM28Ji3o9VimwMU8A,6645
 ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=Q97zfe2h2RaxADkoBAqd0uEiP16BFOajrTmXHMkL2EQ,25502
 ararpy/thermo/basic.py,sha256=nBGHI9uK7VdJwThwBIOcKAzdnYqPyQseFoY6s4zKizk,11504
-ararpy-0.1.197.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.1.197.dist-info/METADATA,sha256=8NvwxRi26W7FyuMwX3wmWhEppV4dlJzorKdi3fvrA1U,24517
-ararpy-0.1.197.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ararpy-0.1.197.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.1.197.dist-info/RECORD,,
+ararpy-0.1.198.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.1.198.dist-info/METADATA,sha256=qPS0ttNBqLL1fwXj0pBm6xgUWwf_liMLIuw5Y_25zQE,24517
+ararpy-0.1.198.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ararpy-0.1.198.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.1.198.dist-info/RECORD,,