ararpy 0.2.5__tar.gz → 0.2.7__tar.gz

{ararpy-0.2.5 → ararpy-0.2.7}/PKG-INFO

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

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.2.5'
+version = '0.2.7'
 __version__ = version
 full_version = version
-last_update = '2026-01-08'
+last_update = '2026-02-03'
 
 """ ArArPy Functions """
 

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy/calc/age.py

@@ -93,7 +93,7 @@ def calc_age_min(F, sF, **kwargs) -> tuple:
         BB = 1
         KK = np.exp(t / V) - 1  # 40Arr / 40K Use standard age
     else:  # use Ar40* and K concentrations of primary standard
-        # not fanished, this function is wrong
+        # not finished, this function is wrong
         BB = (Ab + Ae) / Ae
         KK = Ap / Kp / f
         raise TypeError(f"Not use standard age. Not supported.")

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy/files/arr_file.py

@@ -33,6 +33,6 @@ def save(file_path, sample):
     # with open(file_path, 'w') as f:
     # # save serialized json data to a readable text
     #     f.write(basic_funcs.getJsonDumps(sample))
-    return f"{sample.Info.sample.name}.arr"
+    return f"{sample.Info.experiment.name}.arr"
 
 

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy/smp/basic.py

@@ -161,6 +161,18 @@ def calc_j(ar40ar39=None, params: dict = None, smp: Sample = None, index: list =
 
 
 def calc_mdf(ar40ar36=None, params: dict = None, smp: Sample = None, index: list = None):
+    """
+    Parameters
+    ----------
+    ar40ar36
+    params
+    smp
+    index
+
+    Returns
+    -------
+
+    """
     params_index_dict = {
         71: 'M36', 72: 'sM36', 79: 'M40', 80: 'sM40', 93: 'Air', 94: 'rsAir', 100: 'Discr'
     }
@@ -193,7 +205,7 @@ def calc_mdf(ar40ar36=None, params: dict = None, smp: Sample = None, index: list
     for i in range(len(index)):
         k = calc.corr.mdf(ar40ar36[0][i], ar40ar36[1][i], params['M36'][i], params['M40'][i],
                           params['Air'][i], params['rsAir'][i])  # linear, exp, pow
-        mdf.append({"linear": k[0:4], "exp": k[4:8], "pow": k[8:12]}[params['Discr'][i].lower()])
+        mdf.append({"l": k[0:4], "e": k[4:8], "p": k[8:12]}[params['Discr'][i].lower()[0]])
 
     if len(index) == 1:
         return np.transpose(mdf).squeeze().tolist()

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy/smp/export.py

@@ -1980,10 +1980,10 @@ class CreatePDF:
             self.color_rgb_normalized(self.color_hex_to_rgb(plot.set3.border_color))
         ]
         for (x, sx, y, sy, r, i) in data:
-            if (i - 1) in set1.data:
+            if i in set1.data:
                 pt.scatter(x, y, stroke_color=stroke_colors[0], fill_color=colors[0], line_width=int(float(plot.set1.border_width) / 2),
                            size=int(float(plot.set1.symbol_size) / 3), z_index=10)
-            elif (i - 1) in set2.data:
+            elif i in set2.data:
                 pt.scatter(x, y, stroke_color=stroke_colors[1], fill_color=colors[1], line_width=int(float(plot.set2.border_width) / 2),
                            size=int(float(plot.set2.symbol_size) / 3), z_index=10)
             else:

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy/smp/table.py

@@ -133,10 +133,10 @@ def update_handsontable(smp: Sample, data: list, id: str):
         data = _normalize_data(data, len(samples.SPECTRUM_TABLE_HEADERS), n, 3)
         smp.ApparentAgeValues = _digitize_data(data)
     elif id == '7':  # 等时线
-        data = _normalize_data(data, len(samples.ISOCHRON_TABLE_HEADERS), n, 3)
+        data = _normalize_data(data, len(samples.ISOCHRON_TABLE_HEADERS), n, 3, 0, smp.IsochronsTable.text_indexes)
         smp.IsochronValues = _digitize_data(data)
     elif id == '8':  # 总参数
-        data = _normalize_data(data, len(samples.TOTAL_PARAMS_HEADERS), n, 3)
+        data = _normalize_data(data, len(samples.TOTAL_PARAMS_HEADERS), n, 3, 0, smp.TotalParamsTable.text_indexes)
         data = _digitize_data(data)
         data[101: 112] = [_strToBool(i) for i in data[101: 112]]
         smp.TotalParam = data
@@ -232,4 +232,5 @@ def _strToBool(cols):
     bools_dict = {
         'true': True, 'false': False, 'True': True, 'False': False, '1': True, '0': False, 'none': False,
     }
+    cols = [int(col) if isinstance(col, float) else col for col in cols]
     return [bools_dict.get(str(col).lower(), False) for col in cols]

{ararpy-0.2.5 → ararpy-0.2.7}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.2.5 → ararpy-0.2.7}/setup.py

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