ararpy 0.1.193__tar.gz → 0.1.195__tar.gz

{ararpy-0.1.193 → ararpy-0.1.195}/PKG-INFO

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

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy/__init__.py

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

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy/calc/arr.py

@@ -575,7 +575,7 @@ def wtd_mean(a: list, e: list, sf: int = 1, adjust_error: bool = True):
     k0 = sum(a * wt) / sum(wt)  # error weighting
     k4 = sum((a - k0) ** 2 * wt)  # Chi square
     k3 = k4 / df  # MSWD mentioned in Min et al., 2000
-    if adjust_error:
+    if adjust_error and k3 > 1:
         k1 = (k3 / sum(wt)) ** .5
     else:
         k1 = (1 / sum(wt)) ** .5

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy/smp/basic.py

@@ -500,10 +500,16 @@ def set_params(smp: Sample, params: Union[List, str], flag: Optional[str] = None
             flag = params.split(".")[-1]
         return set_params(smp, read_params(params), flag=flag)
 
+    def isValid(item):
+        valid = True
+        if isinstance(item, (float, int)):
+            valid = not np.isnan(item)
+        return valid and item is not None and item != ""
+
     def remove_none(old_params, new_params, row_list, length):
         res = [[old_params[i][j] if j < len(old_params[i]) else None for j in range(max(len(old_params[i]), length))] for i in range(len(old_params))]
         for index, item in enumerate(new_params):
-            if item is not None:
+            if isValid(item):
                 for row in row_list:
                     res[index][row] = item
         return res

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy/smp/corr.py

@@ -349,7 +349,7 @@ def calc_degas_r(sample: Sample):
     """
     ar40ar = calc.arr.sub(sample.CorrectedValues[8:10], sample.DegasValues[30:32])
     ar40r = calc.arr.sub(ar40ar, sample.DegasValues[26:28])
-    ar40r[0] = [item if item >= 0 else 0 for item in ar40r[0]]
+    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(ar40r[0])
 

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy/smp/export.py

@@ -1069,7 +1069,7 @@ class WritingWorkbook:
         material = self.sample.Info.sample.material
         weight = self.sample.Info.sample.weight
         J_value = self.sample.TotalParam[67][0]
-        J_error = self.sample.TotalParam[68][0]
+        J_error = self.sample.TotalParam[68][0] * self.sample.TotalParam[67][0] / 100
         sigma = self.sample.Info.preference['confidenceLevel']
         sequence_type = {"StepLaser": "Laser", "StepFurnace": "Temperature", "StepCrusher": "Drop", }.get(method, "Step Value")
         sequence_unit = self.sample.Info.sample.sequence_unit if self.sample.Info.sample.sequence_unit != "" else "Unit"

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy/smp/initial.py

@@ -268,10 +268,10 @@ def initial_plot_styles(sample: Sample, except_attrs=None):
             set_attr(plot, key, attr)
 
 
-def re_set_smp(sample: Sample):
+def re_set_smp(smp: Sample):
     std = initial(Sample())
-    basic.get_merged_smp(sample, std)
-    return sample
+    basic.get_merged_smp(smp, std)
+    return check_version(smp)
 
 
 def check_version(smp: Sample):
@@ -286,10 +286,11 @@ def check_version(smp: Sample):
 
     """
     if smp.version != samples.VERSION:
-        re_set_smp(smp)
-    if int(smp.version) <= 20250328:  # Experiment info
-        smp.Info.experiment.name = smp.name()
-        smp.Info.experiment.step_num = smp.sequence().size
+        std = initial(Sample())
+        basic.get_merged_smp(smp, std)
+    # if int(smp.version) <= 20250328:  # Experiment info
+    smp.Info.experiment.name = smp.name()
+    smp.Info.experiment.step_num = smp.sequence().size
     return smp
 
 
@@ -356,7 +357,7 @@ def from_calc_files(file_path: str, **kwargs):
     """
     file = calc_file.ArArCalcFile(file_path=file_path, **kwargs).open()
     sample = create_sample_from_df(file.get_content(), file.get_smp_info())
-    return sample
+    return check_version(sample)
 
 
 # create
@@ -375,7 +376,7 @@ def from_full_files(file_path: str, sample_name: str = None):
         sample_name = str(os.path.split(file_path)[-1]).split('.')[0]
     content, sample_info = calc_file.open_full_xls(file_path, sample_name)
     sample = create_sample_from_dict(content=content, smp_info=sample_info)
-    return sample
+    return check_version(sample)
 
 
 # create
@@ -453,4 +454,4 @@ def from_raw_data(raw: RawData, mapping: Optional[List[dict]] = None) -> Sample:
 
     # sample.TotalParam[31] = [raw.get_sequence(row['unknown'], flag='name').datetime for row in mapping]
 
-    return sample
+    return check_version(sample)

{ararpy-0.1.193 → ararpy-0.1.195}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.1.193 → ararpy-0.1.195}/setup.py

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