ararpy 0.1.28__py3-none-any.whl → 0.1.30__py3-none-any.whl

ararpy/calc/raw_funcs.py

@@ -29,6 +29,9 @@ def get_raw_data_regression_results(points_data, unselected: list = None):
     -------
 
     """
+    def power(a0, a1):
+        # return regression.power(a0, a1)
+        raise ValueError("Deprecated regression")
     # if unselected is None:
     #     unselected = []
     # linesData = []
@@ -36,7 +39,7 @@ def get_raw_data_regression_results(points_data, unselected: list = None):
     # un_x = transpose(unselected)[0] if is_twoD(unselected) else []
     reg_handler = [
         regression.linest, regression.quadratic, regression.exponential,
-        regression.power, regression.average]
+        power, regression.average]
     # size = 50
     # lines_x = [(max(x + un_x) - 0) / size * i for i in range(size + 1)]
     for i in range(len(reg_handler)):

ararpy/files/raw_file.py

@@ -22,6 +22,7 @@ from parse import parse as string_parser
 import dateutil.parser as datetime_parser
 from ..calc.arr import get_item
 from ..calc.basic import utc_dt
+from ..smp.sample import RawData
 
 """ Open raw data file """
 
@@ -211,8 +212,28 @@ def open_raw_xls(file_path, input_filter: List[Union[str, int]]):
 
 
 def open_raw_seq(file_path, input_filter=None):
+
+    class RenameUnpickler(pickle.Unpickler):
+        def find_class(self, module: str, name: str):
+            MODULE = RawData().__module__
+            renamed_module = module
+            if '.sample' in module and module != MODULE:
+                renamed_module = MODULE
+            try:
+                return super(RenameUnpickler, self).find_class(renamed_module, name)
+            except AttributeError:
+                return super(RenameUnpickler, self).find_class(renamed_module, 'ArArBasic')
+
+    def renamed_load(file_obj):
+        return RenameUnpickler(file_obj).load()
+
     with open(file_path, 'rb') as f:
-        sequences = pickle.load(f)
+        sequences = renamed_load(f)
+
+    # with open(file_path, 'rb') as f:
+    #     sequences = pickle.load(f)
+    #     print(sequences[0].__module__)
+
     name_list = []
     for seq in sequences:
         while seq.name in name_list:

ararpy/smp/export.py

@@ -1228,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/smp/initial.py

@@ -298,10 +298,28 @@ 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
 
+    # 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 = [], []

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.28.dist-info → ararpy-0.1.30.dist-info}/METADATA

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

{ararpy-0.1.28.dist-info → ararpy-0.1.30.dist-info}/RECORD

@@ -10,7 +10,7 @@ ararpy/calc/histogram.py,sha256=0GVbDdsjd91KQ1sa2B7NtZ4KGo0XpRIJapgIrzAwQUo,5777
 ararpy/calc/isochron.py,sha256=ej9G2e68k6yszonWHsLcEubh3TA7eh1upTJP_X0ttAA,5726
 ararpy/calc/jvalue.py,sha256=OL5zPYU8Pac-wOxUWPCgu3onh2n01xDnhpi2mlUsjJM,1146
 ararpy/calc/plot.py,sha256=sUqjKBdAEjFarUoSCLqf8cbUM0rEAdZhmtyXB2K7LkA,2139
-ararpy/calc/raw_funcs.py,sha256=UC01lvA6GyZ5FJv43jgoUULAFoLnZJMxeSa0BeVFCAM,2637
+ararpy/calc/raw_funcs.py,sha256=UPwXlYBwE1ugYRD9rsOs8JqJtm14FGcpWmUpUYJ4Roc,2744
 ararpy/calc/regression.py,sha256=mHUKobKx-Q9c7E49vPoQA2tA-MwO9BWvCp3VfnuUhUA,39776
 ararpy/calc/spectra.py,sha256=_Q23eP9necHlaCoHf3_UfW1N3JmVZj5rcWFro8GS-CA,1995
 ararpy/examples/022_VU124-M11a.ahd,sha256=3m0Gd-ZObou3KsnRNFMf77QwzT1Uz3nu3vA33Sqeyng,5414
@@ -37,7 +37,7 @@ ararpy/files/arr_file.py,sha256=KqksGlEA6nmMQofTgi7v45flscQZVtefxaNCKrV3Am4,837
 ararpy/files/basic.py,sha256=nc7Hgo_qLSkdmtKzZmd5SQ8Jy0dhW46ly4gh-oisUDs,2095
 ararpy/files/calc_file.py,sha256=wbt-cQhPnFJ32QyofXvjCPPehmWSj4CHnidkrP7dFgk,28694
 ararpy/files/new_file.py,sha256=efblARIBROVLWS2w3-98BxLX5VZ8grRpiTkJFtf_rAk,214
-ararpy/files/raw_file.py,sha256=PSJ0WwZHSIRrNDre69UwzpGevZQkI7utqhm9aKAm_Rs,20797
+ararpy/files/raw_file.py,sha256=AUvx5Uh3aTQvGy7mXQ7771CeqFZ8u-KgdJvVOD-pU8k,21557
 ararpy/files/xls.py,sha256=DVcZ_yRnc19p-m4leGGjt-YPDpSa2udYKmGyrM0qub0,640
 ararpy/smp/EXPORT_TO_PDF_DATA_PROPERTIES.py,sha256=baDM437tu6hsPv0uYfod0TREXlPd6kvMBFT1S9ZZlkk,3024
 ararpy/smp/__init__.py,sha256=k6_fa27UJsQK7K7oC5GYlwMo6l0Xd8af3QtOrZz2XJk,478
@@ -46,21 +46,21 @@ ararpy/smp/calculation.py,sha256=LCFJWjLVLEKEQ5b7RFUIxsMahEzgLdodW4kCYXV5Z34,291
 ararpy/smp/consts.py,sha256=XIdjdz8cYxspG2jMnoItdlUsxr3hKbNFJjMZJh1bpzw,393
 ararpy/smp/corr.py,sha256=TzH7rymToJP0RCI0pQm-SrqnwAZ58HJbxahE8chv2wQ,26511
 ararpy/smp/diffusion_funcs.py,sha256=4-PMMIZWzjk2HOYYWNgSp4GmApygp1MmOxJ2g3xrqWc,175049
-ararpy/smp/export.py,sha256=hgbsbE70QoAyQSDZ2JJgOkltL6D9YMms_5MAuxAHq3U,116221
+ararpy/smp/export.py,sha256=eBUGx9eUHQ7EoibT-PC1HK7Zw_V1LUfuKJv56_XccUQ,117284
 ararpy/smp/info.py,sha256=iKUELm-BuUduDlJKC1d8tKKNHbwwbNmhUg2pi6bcBvA,489
-ararpy/smp/initial.py,sha256=Wfjn9gyJyMSCRjPNIUhxDBw3b3_f-9Ui_iHAYkjFxWg,17332
+ararpy/smp/initial.py,sha256=GFLEYxes-_PT_qgZj0Dagy_blg9JmzjO7uh3vQHbS78,17891
 ararpy/smp/json.py,sha256=BTZCjVN0aj9epc700nwkYEYMKN2lHBYo-pLmtnz5oHY,2300
 ararpy/smp/plots.py,sha256=rF0vrFu9dMt2Eu1EHiDfDRC9232M6dH0Unc_3qNDxLY,33579
 ararpy/smp/raw.py,sha256=51n-rrbW2FqeZHQyevuG7iObPLGvIBzTe414QDVM1FE,6523
-ararpy/smp/sample.py,sha256=N0ChOxMgNYLU_EwJvGXJARWnubsaKXmvS7jmM-uW7mg,57948
+ararpy/smp/sample.py,sha256=slKiGUobEG7ZfJW6byBgc9jlWN1-zLg27iEdm-No5dw,58228
 ararpy/smp/style.py,sha256=wCygwtpCflhzwmI7u08X-feYGPytOyfR98YcgJx813c,7678
 ararpy/smp/table.py,sha256=9bNAOqAIOc0nSC3LNeqjJKUYSJSM28Ji3o9VimwMU8A,6645
 ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=Q97zfe2h2RaxADkoBAqd0uEiP16BFOajrTmXHMkL2EQ,25502
 ararpy/thermo/basic.py,sha256=nBGHI9uK7VdJwThwBIOcKAzdnYqPyQseFoY6s4zKizk,11504
-ararpy-0.1.28.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.1.28.dist-info/METADATA,sha256=DWqHjjrlOGBYz0bastBt3JX2UIxLvCp5HmvAu-MELRE,24516
-ararpy-0.1.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ararpy-0.1.28.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.1.28.dist-info/RECORD,,
+ararpy-0.1.30.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.1.30.dist-info/METADATA,sha256=OkwCC5DEb-8Q_ZtpeNhcLuYsBvA6nzyVQ6ZMpRYjkko,24516
+ararpy-0.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ararpy-0.1.30.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.1.30.dist-info/RECORD,,