ararpy 0.1.27__tar.gz → 0.1.29__tar.gz

{ararpy-0.1.27 → ararpy-0.1.29}/PKG-INFO

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

{ararpy-0.1.27 → ararpy-0.1.29}/ararpy/smp/export.py

@@ -310,7 +310,7 @@ def getRectFromSpectra(data):
 
     """
     data = np.array(data)
-    return list(map(lambda index: [data[index,0], min(data[index,[1,2]]), np.diff(data[[index,index+1],0])[0], np.diff(data[index,[1,2]])[0]], list(range(len(data) - 1))))
+    return list(filter(lambda rect: rect[2] != 0 and rect[3] != 0, map(lambda index: [data[index,0], min(data[index,[1,2]]), abs(data[index+1,0] - data[index,0]), abs(data[index,1] - data[index,2])], list(range(len(data) - 1)))))
 
 
 def _get_additional_text_series(name):
@@ -364,7 +364,6 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             plateau_data = np.array(set_data[index])
             # spectra_fill_data = list(map(lambda each: [data[0][each - 1], min(data[1][each], data[2][each]), data[0][each + 1] - data[0][each], sigma * abs(data[1][each] - data[2][each])], selection))
             spectra_fill_data = getRectFromSpectra(plateau_data)
-            print(spectra_fill_data)
             series.append({
                 'type': 'series.rect', 'id': f'rect-{smp.name()}-{get_random_digits()}', 'name': f'rect-{smp.name()}-{get_random_digits()}',
                 'color': ['red', 'blue'][index], 'fill_color': ['red', 'blue'][index], 'line_width': 0, 'line_style': 'none', 'z_index': 9,
@@ -1229,20 +1228,36 @@ class WritingWorkbook:
 
     def write_sht_table(self, sht_name, prop_name, sht_type, row, col, _, smp_attr_name, header_name, style, xls, sigma=1):
         sht = xls.add_worksheet(sht_name)
+        num_step = len(self.sample.SequenceName)
         data = arr.transpose(getattr(self.sample, smp_attr_name, None).data)
         sht.hide_gridlines(2)  # 0 = show grids, 1 = hide print grid, else = hide print and screen grids
         sht.hide()  # default hidden table sheet
         sht.set_column(0, len(data), width=12)  # column width
         header = getattr(sample, header_name)
         header = list(map(lambda each: each if "σ" not in each else each.replace('1', str(sigma)) if str(sigma) not in each else each.replace('2', str(sigma)), header))
-        sht.write_row(row=row - 1, col=col, data=header, cell_format=style)
-        for index, col_data in enumerate(data):
-            if "σ" in header[col]:
-                col_data = list(map(lambda each: each * sigma, col_data))
-            res = sht.write_column(row=row, col=col, data=col_data, cell_format=style)
-            if res:
-                raise ValueError(res)
-            col += 1
+
+        content = [
+            [(0, 0), f"{sht_name}", {'bold': 1, 'top': 1, 'align': 'left'}],
+            *[[(1, col, 2, col), each, {'bold': 1, 'top': 1, 'bottom': 6}] for col, each in enumerate(header)],
+            *[[(3, col, 1), each if "σ" not in header[col] else list(map(lambda _: _ * sigma, each)), {}] for col, each in enumerate(data)],
+            [(3 + num_step, 0, 0), [''] * len(data), {'bold': 1, 'top': 1}],
+        ]
+
+        for pos, value, _prop in content:
+            prop = self.default_fmt_prop.copy()
+            prop.update(_prop)
+            fmt = Format(prop, xls.xf_format_indices, xls.dxf_format_indices)
+            xls.formats.append(fmt)
+            if isinstance(value, (list, np.ndarray)) and len(pos) == 3:
+                value = [None if isinstance(v, (float, int)) and np.isnan(v) else v for v in value]
+                [sht.write_row, sht.write_column][pos[2]](*pos[:2], value, fmt)
+            elif len(pos) == 2:
+                isnumeric = isinstance(value, (float, int)) and not np.isnan(value) and not np.isinf(value)
+                [sht.write_string, sht.write_number][isnumeric](*pos, value if isnumeric else str(value), fmt)
+            elif len(pos) == 4:
+                isnumeric = isinstance(value, (float, int)) and not np.isnan(value) and not np.isinf(value)
+                sht.merge_range(*pos, value if isnumeric else str(value), fmt)
+
 
     def write_sht_chart(self, sht_name, prop_name, sht_type, row, col, _, smp_attr_name, header_name, style, xls, start_row, total_rows):
         sht = xls.add_chartsheet(sht_name)

{ararpy-0.1.27 → ararpy-0.1.29}/ararpy/smp/initial.py

@@ -298,21 +298,42 @@ def check_version(smp: Sample):
         std = initial(Sample())
         basic.get_merged_smp(smp, std)
 
+    try:
+        version = int(smp.version)
+    except ValueError:
+        return smp
+
     # 20250328:  # Experiment info
     smp.Info.experiment.name = smp.name()
     smp.Info.experiment.step_num = smp.sequence().size
 
-    # 20250404
+    # old version: add masses and gain factors
+    if version < 20240730:
+        gains = np.ones([10, smp.Info.experiment.step_num])
+        gains[[1, 3, 5, 7, 9], :] = 0
+        smp.TotalParam[126:136] = gains.tolist()
+        gains[0] = 35.96754628
+        gains[2] = 36.9667759
+        gains[4] = 37.9627322
+        gains[6] = 38.964313
+        gains[8] = 39.962383123
+        smp.TotalParam[71:81] = gains.tolist()
+        smp.version = "20240730"
+
+    # 20250404:  # Normalization for steps with different J values
     doNormalize = True
     v, sv = [], []
-    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[93:95]
-        sv = np.multiply(v, sv) / 100
-    elif smp.Info.sample.type.lower() == "standard":
-        v, sv = smp.TotalParam[59:61]
+    try:
+        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[93:95]
+            sv = np.multiply(v, sv) / 100
+        elif smp.Info.sample.type.lower() == "standard":
+            v, sv = smp.TotalParam[59:61]
+    except:
+        doNormalize = False
     smp.NormalizeFactor = [
         [1 if v[0] == each or not doNormalize else v[0] / each for each in v],
         [0 if v[0] == v[i] or not doNormalize else err.div((v[0], sv[0]), (v[i], sv[i])) for i in range(len(v))]

{ararpy-0.1.27 → ararpy-0.1.29}/ararpy/smp/sample.py

@@ -776,7 +776,7 @@ DEFAULT_PLOT_STYLES = lambda sample_type, age_unit: {
     },
 }
 
-VERSION = '20250404'
+VERSION = '20250622'
 
 NAMED_DICT = {
     "unknown": {"header": SAMPLE_INTERCEPT_HEADERS.copy()},
@@ -884,12 +884,20 @@ class Sample:
         # self.__version = '20250301'  # update sample info
         # self.__version = '20250321'  # error sigma adjustment
         # self.__version = '20250328'  # Experiment info
-        self.__version = '20250404'  # J normalization factor
+        # self.__version = '20250404'  # J normalization factor
+        self.__version = '20250622'  # version setter
 
     @property
     def version(self):
         return self.__version
 
+    @version.setter
+    def version(self, v):
+        if isinstance(v, (str, int)) and str(v).startswith("20"):
+            self.__version = str(v)
+        else:
+            raise ValueError("Version setter Error")
+
     def help(self) -> str: ...
     
     def name(self) -> str: ...

{ararpy-0.1.27 → ararpy-0.1.29}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.1.27 → ararpy-0.1.29}/setup.py

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