ararpy 0.2.1__tar.gz → 0.2.3__tar.gz

{ararpy-0.2.1 → ararpy-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.2.1
+Version: 0.2.3
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu
@@ -12,6 +12,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: chardet
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: parse
+Requires-Dist: scipy
+Requires-Dist: xlrd
+Requires-Dist: XlsxWriter
+Requires-Dist: pdf_maker
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -20,6 +28,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
+Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.2.01'
+version = '0.2.3'
 __version__ = version
 full_version = version
-last_update = '2025-12-31'
+last_update = '2026-01-01'
 
 """ ArArPy Functions """
 

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/calc/corr.py

@@ -272,6 +272,7 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
                   G40: Tuple[float, float], G39: Tuple[float, float], G38: Tuple[float, float],
                   G37: Tuple[float, float], G36: Tuple[float, float],
                   stand_time_year: float, JNFactor: Tuple[float, float],
+                  KCaFactor: Tuple[float, float], KClFactor: Tuple[float, float],
                   **options):
     """
 
@@ -359,6 +360,9 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
     R38v39k = random_normal_relative(*R38v39k, size=Monte_Carlo_Size)
     R36v38clp = random_normal_relative(*R36v38clp, size=Monte_Carlo_Size)
 
+    KCa = random_normal_relative(*KCaFactor, size=Monte_Carlo_Size)
+    KCl = random_normal_relative(*KClFactor, size=Monte_Carlo_Size)
+
     JNFactor = random_normal_absolute(*JNFactor, size=Monte_Carlo_Size)
 
     def do_simulation():
@@ -380,31 +384,23 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
             _ar39 = (ar39m[i] / G39[i] - ar39b[i] / (G39[i] if blank_gain_corr else 1)) * P39Mdf * P39Decay
             _ar40 = (ar40m[i] / G40[i] - ar40b[i] / (G40[i] if blank_gain_corr else 1)) * P40Mdf
 
+            _ar37ca = _ar37
+
             if force_to_zero:
-                _ar36 = max(_ar36, 0)
-                _ar37 = max(_ar37, 0)
-                _ar38 = max(_ar38, 0)
-                _ar39 = max(_ar39, 0)
-                _ar40 = max(_ar40, 0)
+                _ar37ca = max(_ar37, 0)
 
-            _ar37ca = _ar37
             _ar39ca = _ar37ca * R39v37ca[i]
             _ar38ca = _ar37ca * R38v37ca[i]
             _ar36ca = _ar37ca * R36v37ca[i]
 
+            _ar39k = _ar39 - _ar39ca
+
             if force_to_zero:
-                _ar39ca = min(_ar39ca, _ar39)
-                _ar38ca = min(_ar38ca, _ar38)
-                _ar36ca = min(_ar36ca, _ar36)
+                _ar39k = max(_ar39k, 0)
 
-            _ar39k = _ar39 - _ar39ca
             _ar38k = _ar39k * R38v39k[i]
             _ar40k = _ar39k * R40v39k[i]
 
-            if force_to_zero:
-                _ar38k = min(_ar38k, _ar38 - _ar38ca)
-                _ar40k = min(_ar40k, _ar40)
-
             _ar38res = _ar38 - _ar38k - _ar38ca
             _ar36res = _ar36 - _ar36ca
 
@@ -433,6 +429,8 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
 
             factor = JNFactor[i]
 
+            _CaK = _ar37ca / _ar39k / KCa[i]
+
             i += 1
 
             yield _ar36a, 0, _ar36ca, _ar36cl, _ar37ca, _ar38cl, _ar38a, 0, _ar38k, _ar38ca, _ar39k, _ar39ca, _ar40r, _ar40a, 0, _ar40k, \
@@ -442,7 +440,7 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
                   (_ar39k * factor) / _ar40r, _ar38cl / _ar40r, \
                   _ar38cl / (_ar39k * factor), _ar40r / (_ar39k * factor), \
                   _ar36res / _ar40ar, _ar38res / _ar40ar, (_ar39k * factor) / _ar40ar, \
-                  _ar36, _ar37, _ar38, _ar39, _ar40
+                  _ar36, _ar37, _ar38, _ar39, _ar40, _CaK
 
     data = np.array(list(do_simulation()))
     means = data.mean(axis=0)
@@ -467,8 +465,9 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
     corrected_data = np.column_stack((means[29:34], stds[29:34])).ravel()
 
     F = np.append(means[25], stds[25])
+    CaK = np.append(means[34], stds[34])
 
-    return *F, *degas_data, *nor_iso, *inv_iso, *cl1_iso, *cl2_iso, *cl3_iso, *threed_iso, *corrected_data
+    return *F, *degas_data, *nor_iso, *inv_iso, *cl1_iso, *cl2_iso, *cl3_iso, *threed_iso, *corrected_data, *CaK
 
     # print("F = {0} ± {1}".format(np.mean(F), np.std(F)))
     #

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/calc/jvalue.py

@@ -32,8 +32,10 @@ def j_value(age, sage, r, sr, f, rsf):
     f = f * 1000000  # exchange to unit of Ma
     rsf = f * rsf / 100  # exchange to absolute error
     k0 = (np.exp(f * age) - 1) / r
-    v1 = rsf ** 2 * (age * np.exp(f * age) / r) ** 2
-    v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2
-    v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2
-    k1 = np.sqrt(v1 + v2 + v3)
-    return k0, k1, k1, k1
+    v1 = rsf ** 2 * (age * np.exp(f * age) / r) ** 2  # lambda
+    v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2  # age
+    v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2  # 40/39
+    k1 = np.sqrt(v3)
+    k2 = np.sqrt(v3 + v2)
+    k3 = np.sqrt(v3 + v2 + v1)
+    return k0, k1, k2, k3

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/files/calc_file.py

@@ -81,7 +81,7 @@ def open_252(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
         162, 163, 164, 165, 166, 167, 168, 169,  # 40 r, a, c, k    26-33
     ]
     publish_values_index = [
-        101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+        188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
     ]
     apparent_age_values_index = [
         198, 199, 200, 201, -999, -999, 202, 203,  # f, sf, ages, s, s, s, 40Arr%, 39Ar%
@@ -244,7 +244,9 @@ def open_240(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
         148, -999, 149, -999, 150, -999, 151, -999,
     ]
     publish_values_index = [
-        99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1,
+        -1, -1, -1, -1,
     ]
     apparent_age_values_index = [
         # f, sf, ages, s, s, s, 39Ar%

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/smp/basic.py

@@ -119,7 +119,7 @@ def calc_apparent_ages(smp: Sample):
         raise TypeError(f"Sample type is not supported: {smp.Info.sample.type}")
 
     smp.ApparentAgeValues[2:6] = v[0:4]
-    smp.PublishValues[5:7] = copy.deepcopy(v[0:2])
+    smp.PublishValues[12:14] = copy.deepcopy(v[0:2])
 
 
 def calc_j(ar40ar39=None, params: dict = None, smp: Sample = None, index: list = None):
@@ -591,7 +591,7 @@ def get_diff_smp(backup: (dict, Sample), smp: (dict, Sample)):
             if _res != {}:
                 res.update({name: _res})
             continue
-        if str(backup[name]) == str(attr) or backup[name] == attr:
+        if str(backup[name]) == str(attr):
             continue
         res.update({name: attr})
     return res

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/smp/corr.py

@@ -55,7 +55,6 @@ def corr_blank(sample: Sample):
     for i in range(0, 10, 2):
         blank_corrected[i] = [blank_corrected[i][index] if sample.TotalParam[102][index] else j for index, j in enumerate(sample.SampleIntercept[i])]
         blank_corrected[i + 1] = [blank_corrected[i + 1][index] if sample.TotalParam[102][index] else j for index, j in enumerate(sample.SampleIntercept[i + 1])]
-        blank_corrected[i] = [0 if j < 0 and sample.TotalParam[101][index] else j for index, j in enumerate(blank_corrected[i])]
     sample.BlankCorrected = blank_corrected
 
 
@@ -147,9 +146,6 @@ def corr_decay(sample: Sample):
             *sample.MassDiscrCorrected[2:4], t1, t2, t3, *sample.TotalParam[44:46], isRelative=True)
         decay_corrected[6:8] = calc.corr.decay(
             *sample.MassDiscrCorrected[6:8], t1, t2, t3, *sample.TotalParam[42:44], isRelative=True)
-        # Negative number set to zero in decay correction
-        decay_corrected[2] = [0 if i < 0 else i for i in decay_corrected[2]]
-        decay_corrected[6] = [0 if i < 0 else i for i in decay_corrected[6]]
     except Exception as e:
         print(traceback.format_exc())
         raise ValueError(f'Decay correction error: {str(e)}')
@@ -162,6 +158,10 @@ def corr_decay(sample: Sample):
     sample.CorrectedValues[6] = [val if corrDecay39[idx] else 0 for idx, val in enumerate(decay_corrected[6])]
     sample.CorrectedValues[7] = [val if corrDecay39[idx] else 0 for idx, val in enumerate(decay_corrected[7])]
 
+    data = np.array(sample.CorrectedValues)
+    data[1:10:2] = data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+    sample.PublishValues[0:10] = copy.deepcopy(data.tolist())
+
 
 # =======================
 # Degas Calcium derived 37Ar 36Ar 38Ar 39Ar
@@ -189,8 +189,10 @@ def calc_degas_ca(sample: Sample):
     if not validate_params(**params_to_check):
         return
 
+    set_negative_zero = sample.TotalParam[101]
     corrDegasCa = sample.TotalParam[106]
-    ar37ca = sample.CorrectedValues[2:4]
+    ar37ca = copy.deepcopy(sample.CorrectedValues[2:4])
+    ar37ca[0] = [0 if val < 0 and set_negative_zero[i] else val for i, val in enumerate(ar37ca[0])]
     ar39ca = calc.arr.mul_factor(ar37ca, sample.TotalParam[8:10], isRelative=True)
     ar38ca = calc.arr.mul_factor(ar37ca, sample.TotalParam[10:12], isRelative=True)
     ar36ca = calc.arr.mul_factor(ar37ca, sample.TotalParam[12:14], isRelative=True)
@@ -201,7 +203,6 @@ def calc_degas_ca(sample: Sample):
     sample.DegasValues[19] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar38ca[1])]
     sample.DegasValues[22] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar39ca[0])]  # 39Ca
     sample.DegasValues[23] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar39ca[1])]
-    sample.PublishValues[1] = copy.deepcopy(sample.DegasValues[8])
 
 
 # =======================
@@ -242,7 +243,6 @@ def calc_degas_k(sample: Sample):
     sample.DegasValues[17] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar38k[1])]
     sample.DegasValues[30] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar40k[0])]
     sample.DegasValues[31] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar40k[1])]
-    sample.PublishValues[3] = copy.deepcopy(sample.DegasValues[20])
 
 
 # =======================
@@ -351,7 +351,6 @@ def calc_degas_cl(sample: Sample):
 
     sample.DegasValues[6:8] = copy.deepcopy(ar36cl)
     sample.DegasValues[10:12] = copy.deepcopy(ar38cl)
-    sample.PublishValues[2] = copy.deepcopy(sample.DegasValues[10])
 
 
 # =======================
@@ -408,7 +407,6 @@ def calc_degas_atm(sample: Sample):
     sample.DegasValues[13] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar38a[1])]
     sample.DegasValues[26] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar40a[0])]  # Ar40a
     sample.DegasValues[27] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar40a[1])]
-    sample.PublishValues[0] = copy.deepcopy(sample.DegasValues[ 0])
 
 
 # =======================
@@ -439,7 +437,6 @@ def calc_degas_r(sample: Sample):
     ar40r = calc.arr.sub(ar40ar, sample.DegasValues[26:28])
     ar40r[0] = [0 if item < 0 and sample.TotalParam[101][index] else item for index, item in enumerate(ar40r[0])]
     sample.DegasValues[24:26] = copy.deepcopy(ar40r)
-    sample.PublishValues[4] = copy.deepcopy(sample.DegasValues[24])
 
 
 def calc_degas_c(sample: Sample):
@@ -588,7 +585,8 @@ def calc_ratio(sample: Sample):
         calc.arr.rec_factor(sample.TotalParam[20:22], isRelative=True))
 
     sample.ApparentAgeValues[6] = ar40r_percent
-    sample.PublishValues[7:11] = copy.deepcopy([*sample.ApparentAgeValues[6:8], *CaK])
+    sample.PublishValues[10:12] = copy.deepcopy(sample.ApparentAgeValues[0:2])
+    sample.PublishValues[14:18] = copy.deepcopy([*sample.ApparentAgeValues[6:8], *CaK])
 
     sample.IsochronValues[0:5], sample.IsochronValues[6:11] = calc_nor_inv_isochrons(sample)
     sample.IsochronValues[12:17], sample.IsochronValues[18:23], sample.IsochronValues[24:29] = \
@@ -629,13 +627,11 @@ def calc_ratio_monte_carlo(sample: Sample):
         # corrected
         sample.CorrectedValues = res[2 + 32 + 39:2 + 32 + 39 + 10]
         # publish
-        sample.PublishValues[0] = copy.deepcopy(sample.DegasValues[ 0])
-        sample.PublishValues[1] = copy.deepcopy(sample.DegasValues[ 8])
-        sample.PublishValues[2] = copy.deepcopy(sample.DegasValues[10])
-        sample.PublishValues[3] = copy.deepcopy(sample.DegasValues[20])
-        sample.PublishValues[4] = copy.deepcopy(sample.DegasValues[24])
-        sample.PublishValues[5:7] = copy.deepcopy(sample.ApparentAgeValues[2:4])
-        sample.PublishValues[7:9] = copy.deepcopy(sample.ApparentAgeValues[6:8])
+        data = np.array(sample.CorrectedValues)
+        data[1:10:2] = data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+        sample.PublishValues[0:10] = copy.deepcopy(data.tolist())
+        sample.PublishValues[10:14] = copy.deepcopy(sample.ApparentAgeValues[0:4])
+        sample.PublishValues[14:16] = copy.deepcopy(sample.ApparentAgeValues[6:8])
 
 
 def monte_carlo_f(sample: Sample):
@@ -731,6 +727,10 @@ def monte_carlo_f(sample: Sample):
     R38v36a = np.transpose(sample.TotalParam[4:6])
     R36v38clp = np.transpose(sample.TotalParam[56:58])
 
+    R36v38cl = np.transpose(sample.TotalParam[18:20])  # ?
+    KCaFactor = np.transpose(sample.TotalParam[20:22])
+    KClFactor = np.transpose(sample.TotalParam[22:24])
+
     stand_time_year = np.transpose(sample.TotalParam[32])
     JNFactor = np.transpose(sample.TotalParam[136:138])
 
@@ -764,6 +764,8 @@ def monte_carlo_f(sample: Sample):
             L37ar=L37ar[i], L39ar=L39ar[i], L36cl=L36cl[i],
             MDF=MDF[i], stand_time_year=stand_time_year[i],
             JNFactor=JNFactor[i],
+            KCaFactor=KCaFactor[i],
+            KClFactor=KClFactor[i],
             blank_gain_corr=sample.TotalParam[111][i],
             MDF_method=sample.TotalParam[100][i],
             force_to_zero=sample.TotalParam[101][i],

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/smp/export.py

@@ -1219,7 +1219,7 @@ class WritingWorkbook:
             [(4, 11, 1), list(map(lambda x: 2*x, self.sample.ApparentAgeValues[3])), {'num_format': '± ' + self.default_fmt_prop['num_format']}],
             [(4, 12, 1), self.sample.ApparentAgeValues[6], {}],
             [(4, 13, 1), self.sample.ApparentAgeValues[7], {}],
-            [(4, 14, 1), self.sample.PublishValues[9], {}],
+            [(4, 14, 1), self.sample.PublishValues[16], {}],
             [(4 + num_step, 0, 0), [''] * 15, {'bold': 1, 'top': 1}],
 
             [(5 + num_step, 0), "Table 2. 40Ar/39Ar age summary", {'bold': 1, 'align': 'left'}],

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/smp/initial.py

@@ -128,6 +128,8 @@ def initial(smp: Sample):
     smp.BlankIntercept = arr.create_arr((len(samples.BLANK_INTERCEPT_HEADERS) - 3, 0))
     smp.SampleIntercept = arr.create_arr((len(samples.SAMPLE_INTERCEPT_HEADERS) - 3, 0))
     smp.PublishValues = arr.create_arr((len(samples.PUBLISH_TABLE_HEADERS) - 3, 0))
+    smp.BlankCorrected = arr.create_arr((10, 0))
+    smp.MassDiscrCorrected = arr.create_arr((10, 0))
     smp.DecayCorrected = arr.create_arr((10, 0))
     smp.CorrectedValues = arr.create_arr((len(samples.CORRECTED_HEADERS) - 3, 0))
     smp.DegasValues = arr.create_arr((len(samples.DEGAS_HEADERS) - 3, 0))

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/smp/sample.py

@@ -52,24 +52,36 @@ DEGAS_HEADERS = [
 ]
 PUBLISH_TABLE_HEADERS = [
     'Sequence', '', 'Mark',  # 0-2
-    '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
-    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
-    'Apparent Age', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%',  # 7-10
-    'Ca/K', '1\u03C3',  # 11-12
+    '\u00B3\u2076Ar', '%1\u03C3',
+    '\u00B3\u2077Ar', '%1\u03C3',
+    '\u00B3\u2078Ar', '%1\u03C3',
+    '\u00B3\u2079Ar', '%1\u03C3',
+    '\u2074\u2070Ar', '%1\u03C3', # 3-12
+    '\u2074\u2070Ar/\u00B3\u2076Ar', '1\u03C3',  # 13-14
+    'Apparent Age', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%',  # 15-18
+    'Ca/K', '1\u03C3',  # 19-20
 ]
 PUBLISH_TABLE_HEADERS_AIR = [
     'Sequence', '', 'Mark',  # 0-2
-    '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
-    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
-    'MDF', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 7-10
-    'Ca/K', '1\u03C3',  # 11-12
+    '\u00B3\u2076Ar', '%1\u03C3',
+    '\u00B3\u2077Ar', '%1\u03C3',
+    '\u00B3\u2078Ar', '%1\u03C3',
+    '\u00B3\u2079Ar', '%1\u03C3',
+    '\u2074\u2070Ar', '%1\u03C3',  # 3-12
+    '\u2074\u2070Ar/\u00B3\u2076Ar', '1\u03C3',  # 13-14
+    'MDF', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 15-18
+    'Ca/K', '1\u03C3',  # 19-20
 ]
 PUBLISH_TABLE_HEADERS_STD = [
     'Sequence', '', 'Mark',  # 0-2
-    '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
-    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
-    'J', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 7-10
-    'Ca/K', '1\u03C3',  # 11-12
+    '\u00B3\u2076Ar', '%1\u03C3',
+    '\u00B3\u2077Ar', '%1\u03C3',
+    '\u00B3\u2078Ar', '%1\u03C3',
+    '\u00B3\u2079Ar', '%1\u03C3',
+    '\u2074\u2070Ar', '%1\u03C3',  # 3-12
+    '\u2074\u2070Ar/\u00B3\u2076Ar', '1\u03C3',  # 13-14
+    'J', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 15-18
+    'Ca/K', '1\u03C3',  # 19-20
 ]
 SPECTRUM_TABLE_HEADERS = [
     'Sequence', '', 'Mark',  # 0-2
@@ -200,9 +212,13 @@ DEGAS_SHORT_HEADERS = [
 ]
 PUBLISH_TABLE_SHORT_HEADERS = [
     'Seq', 'Label', 'Mark',  # 0-2
-    'Ar36[a]', 'Ar37[Ca]', 'Ar38[Cl]',
-    'Ar39[K]', 'Ar40[r]', 'Apparent Age', '1s', 'Ar40r%',
-    'Ar39K%', 'Ca/K', '1s'
+    'Ar36', '%1s',
+    'Ar37', '%1s',
+    'Ar38', '%1s',
+    'Ar39', '%1s',
+    'Ar40', '%1s',
+    'Apparent Age', '1s', 'Ar40r%', 'Ar39K%',
+    'Ca/K', '1s'
 ]
 SPECTRUM_TABLE_SHORT_HEADERS = [
     'Seq', 'Label', 'Mark',  # 0-2

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy/smp/table.py

@@ -12,6 +12,7 @@
 import ast
 import re
 import copy
+import numpy as np
 from .. import calc
 from . import (sample as samples, basic)
 
@@ -46,13 +47,11 @@ def update_table_data(smp: Sample, only_table: str = None):
         elif key == '4':
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.DegasValues]
         elif key == '5':
-            smp.PublishValues[0] = copy.deepcopy(smp.DegasValues[ 0])
-            smp.PublishValues[1] = copy.deepcopy(smp.DegasValues[ 8])
-            smp.PublishValues[2] = copy.deepcopy(smp.DegasValues[10])
-            smp.PublishValues[3] = copy.deepcopy(smp.DegasValues[20])
-            smp.PublishValues[4] = copy.deepcopy(smp.DegasValues[24])
-            smp.PublishValues[5:7] = copy.deepcopy(smp.ApparentAgeValues[2:4])
-            smp.PublishValues[7:9] = copy.deepcopy(smp.ApparentAgeValues[6:8])
+            data = np.array(smp.CorrectedValues)
+            data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+            smp.PublishValues[0:10] = copy.deepcopy(data.tolist())
+            smp.PublishValues[10:14] = copy.deepcopy(smp.ApparentAgeValues[0:4])
+            smp.PublishValues[14:16] = copy.deepcopy(smp.ApparentAgeValues[6:8])
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.PublishValues]
         elif key == '6':
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.ApparentAgeValues]

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.2.1
+Version: 0.2.3
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu
@@ -12,6 +12,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: chardet
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: parse
+Requires-Dist: scipy
+Requires-Dist: xlrd
+Requires-Dist: XlsxWriter
+Requires-Dist: pdf_maker
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -20,6 +28,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
+Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 

{ararpy-0.2.1 → ararpy-0.2.3}/ararpy.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ ararpy/test.py
 ararpy.egg-info/PKG-INFO
 ararpy.egg-info/SOURCES.txt
 ararpy.egg-info/dependency_links.txt
+ararpy.egg-info/requires.txt
 ararpy.egg-info/top_level.txt
 ararpy/calc/__init__.py
 ararpy/calc/age.py

ararpy-0.2.3/ararpy.egg-info/requires.txt

@@ -0,0 +1,8 @@
+chardet
+numpy
+pandas
+parse
+scipy
+xlrd
+XlsxWriter
+pdf_maker

{ararpy-0.2.1 → ararpy-0.2.3}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.2.01',  # version
+    version='0.2.3',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description
@@ -25,10 +25,10 @@ setuptools.setup(
     url='https://github.com/wuyangchn/ararpy.git',  # github url
     packages=setuptools.find_packages(),
     package_data={'ararpy': ['examples/*']},
-    # install_requires=[
-    #     "chardet", "numpy", "OriginExt", "pandas", "parse", "python_dateutil",
-    #     "scipy", "setuptools", "xlrd", "XlsxWriter", "pdf_maker"
-    # ],
+    install_requires=[
+        "chardet", "numpy", "pandas", "parse",
+        "scipy", "xlrd", "XlsxWriter", "pdf_maker"
+    ],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Programming Language :: Python :: 3',