ararpy 0.1.21__tar.gz → 0.1.22__tar.gz

{ararpy-0.1.21 → ararpy-0.1.22}/PKG-INFO

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

{ararpy-0.1.21 → ararpy-0.1.22}/ararpy/__init__.py

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

{ararpy-0.1.21 → ararpy-0.1.22}/ararpy/calc/corr.py

@@ -61,10 +61,10 @@ def mdf(rm: float, srm: float, m1: float, m2: float, ra: float = 298.56,
     sratio_m = err.div((m2, sm2), (m1, sm1))
     useRyu = False
     if not useRyu:
-        # line
-        k1 = (ra / rm + delta_m - 1) / delta_m
-        k2 = err.div(((ra / rm + delta_m - 1), err.div((ra, sra), (rm, srm))), (delta_m, sdelta_m))
-        # exp
+        # line, D = 1 + (ra / rm - 1) / dm  # Renne2009
+        k1 = 1 + (ra / rm - 1) / delta_m
+        k2 = err.div(((ra / rm - 1), err.div((ra, sra), (rm, srm))), (delta_m, sdelta_m))
+        # exp, D = 1 + ln(ra / rm) / (m1 * ln(m2/m1))  # Renne2009
         try:
             k3 = (np.log(ra / rm) / np.log(ratio_m)) * (1 / m1) + 1
             v1 = err.log((ra / rm, err.div((ra, sra), (rm, srm))))
@@ -73,7 +73,7 @@ def mdf(rm: float, srm: float, m1: float, m2: float, ra: float = 298.56,
             k4 = err.div((np.log(ra / rm) / np.log(ratio_m), v3), (m1, sm1))
         except Exception:
             k3, k4 = 0, 0
-        # pow
+        # pow, D = pow(ra / rm, 1 / dm)  # Renne2009
         try:
             k5 = pow((ra / rm), (1 / delta_m))  # Renne2009, B.D. Turrin2010
             k6 = err.pow((ra / rm, err.div((ra, sra), (rm, srm))),
@@ -105,18 +105,17 @@ def discr(a0: list, e0: list, mdf: list, smdf: list, m: list, m40: list,
     if isRelative:
         smdf = [smdf[i] * mdf[i] / 100 for i in range(len(smdf))]
     for i in range(min([len(arg) for arg in [a0, e0, mdf, smdf]])):
-        delta_mass = abs(m40[i] - m[i])
-        ratio_mass = abs(m40[i] / m[i]) if m[i] != 0 else 1
-        if method.lower().startswith("l"):
-            k0 = 1 / (delta_mass * mdf[i] - delta_mass + 1) if (delta_mass * mdf[i] - delta_mass + 1) != 0 else 0
-            k1 = err.div((1, 0), (delta_mass * mdf[i] - delta_mass + 1, smdf[i] * delta_mass))
-        elif method.lower().startswith("e"):
-            k0 = 1 / (ratio_mass ** (mdf[i] * m40[i] - m[i]))
-            k1 = err.div((1, 0), (ratio_mass ** (mdf[i] * m40[i] - m[i]), err.pow((ratio_mass, 0), (
-                mdf[i] * m40[i] - m[i], err.mul((mdf[i], smdf[i]), (m40[i], 0))))))
-        elif method.lower().startswith("p"):
-            k0 = 1 / (mdf[i] ** delta_mass)
-            k1 = err.div((1, 0), (mdf[i] ** delta_mass, err.pow((mdf[i], smdf[i]), (delta_mass, 0))))
+        delta_m = abs(m40[i] - m[i])
+        ratio_m = abs(m40[i] / m[i]) if m[i] != 0 else 1
+        if method.lower().startswith("l"):  # linear
+            k0 = 1 / (delta_m * mdf[i] - delta_m + 1) if (delta_m * mdf[i] - delta_m + 1) != 0 else 0
+            k1 = err.rec((delta_m * mdf[i] - delta_m + 1, smdf[i] * delta_m))
+        elif method.lower().startswith("e"):  # exponential
+            k0 = 1 / np.exp((mdf - 1) * m * np.log(m40 / m))
+            k1 = err.rec((1 / k0, err.pow((np.e, 0), ((mdf - 1) * m * np.log(m40 / m), err.mul((mdf - 1, smdf), (m * np.log(m40 / m), 0))))))
+        elif method.lower().startswith("p"):  # power
+            k0 = 1 / (mdf[i] ** delta_m)
+            k1 = err.rec((mdf[i] ** delta_m, err.pow((mdf[i], smdf[i]), (delta_m, 0))))
         else:
             k0 = 1
             k1 = 0

{ararpy-0.1.21 → ararpy-0.1.22}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.1.21 → ararpy-0.1.22}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.1.21',  # version
+    version='0.1.22',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description