ararpy 0.1.24__tar.gz → 0.1.26__tar.gz

{ararpy-0.1.24 → ararpy-0.1.26}/PKG-INFO

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

{ararpy-0.1.24 → ararpy-0.1.26}/ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.24'
+version = '0.1.26'
 __version__ = version
 full_version = version
-last_update = '2024-03-28'
+last_update = '2024-05-22'
 
 """ ArArPy Functions """
 

{ararpy-0.1.24 → ararpy-0.1.26}/ararpy/calc/regression.py

@@ -794,39 +794,31 @@ def power(a0: list, a1: list):
     def _pow_func(x, a, b, c):
         return a * x ** b + c
 
-    def _solve_pow(params):
+    def _residuals(params):
         a, b, c = params
-        x, y = [0, 0, 0], [0, 0, 0]
-        x[0] = sum(a1[:3]) / 3
-        y[0] = sum(a0[:3]) / 3
-        x[1] = sum(a1) / len(a1)
-        y[1] = sum(a0) / len(a0)
-        x[2] = sum(a1[-3:]) / 3
-        y[2] = sum(a0[-3:]) / 3
-        return np.array([
-            _pow_func(x[0], a, b, c) - y[0],
-            _pow_func(x[1], a, b, c) - y[1],
-            _pow_func(x[2], a, b, c) - y[2],
-        ])
-
-    def _get_sum(a, b, c):
-        y_predicted = [_pow_func(_x, a, b, c) for _x in a1]
-        return sum([(y_predicted[i] - a0[i]) ** 2 for i in range(len(a0))])
+        return [_pow_func(xi, a, b, c) - yi for xi, yi in zip(a1, a0)]
+
+    def _sum_squared_error(params):
+        return sum(r**2 for r in _residuals(params))
 
     def _get_abc(b):  # Return a, b, c given b based on linest regression
         f = linest(a0, [_x ** b for _x in a1])
         return f[5][1], b, f[0]
 
+    def _get_init():
+        f = linest(np.log(np.array(a0)), np.log(np.array(a1)))
+        return np.exp(f[0]), f[5][1], 0
+
     try:
-        a, b, c = fsolve(func=_solve_pow, x0=np.array([1, 1, 1]))  # initial estimate
+        a, b, c = _get_init()  # initial estimate
         count = 0
         step = 0.01
         while count < 100:
             a, b, c = _get_abc(b)
-            s = _get_sum(a, b, c)
+            s = _sum_squared_error([a, b, c])
             b_left, b_right = b - step * b, b + step * b
-            s_left = _get_sum(*_get_abc(b_left))
-            s_right = _get_sum(*_get_abc(b_right))
+            s_left = _sum_squared_error(_get_abc(b_left))
+            s_right = _sum_squared_error(_get_abc(b_right))
             if s_left > s > s_right:
                 b = b_right
                 continue
@@ -886,39 +878,32 @@ def exponential(a0: list, a1: list):
     def _exp_func(x, a, b, c):
         return a * b ** x + c
 
-    def _solve_exp(params):
+    def _residuals(params):
         a, b, c = params
-        x, y = [0, 0, 0], [0, 0, 0]
-        x[0] = sum(a1[:3]) / 3
-        y[0] = sum(a0[:3]) / 3
-        x[1] = sum(a1) / len(a1)
-        y[1] = sum(a0) / len(a0)
-        x[2] = sum(a1[-3:]) / 3
-        y[2] = sum(a0[-3:]) / 3
-        return np.array([
-            _exp_func(x[0], a, b, c) - y[0],
-            _exp_func(x[1], a, b, c) - y[1],
-            _exp_func(x[2], a, b, c) - y[2],
-        ])
-
-    def _get_sum(a, b, c):
-        y_predicted = [_exp_func(_x, a, b, c) for _x in a1]
-        return sum([(y_predicted[i] - a0[i]) ** 2 for i in range(len(a0))])
+        return [_exp_func(xi, a, b, c) - yi for xi, yi in zip(a1, a0)]
+
+    def _sum_squared_error(params):
+        return sum(r**2 for r in _residuals(params))
 
     def _get_ac(b):
-        f = linest(a0, [b ** _x for _x in a1])
+        f = linest(a0, [b ** xi for xi in a1])
         return f[5][1], b, f[0]
 
+    def _get_init():
+        f = linest(np.log(np.array(a0)), np.array(a1))
+        return np.exp(f[0]), np.exp(f[5][1]), 0
+
     try:
-        a, b, c = fsolve(_solve_exp, np.array([1, 1, 1]))
+        a, b, c = _get_init()
+        # a, b, c = minimize(_sum_squared_error, [a, b, c], method="Nelder-Mead").x  # 优化方法
         count = 0
         step = 0.01
         while count < 100:
             a, b, c = _get_ac(b)
-            s = _get_sum(a, b, c)
+            s = _sum_squared_error([a, b, c])
             b_left, b_right = b - step * b, b + step * b
-            s_left = _get_sum(*_get_ac(b_left))
-            s_right = _get_sum(*_get_ac(b_right))
+            s_left = _sum_squared_error(_get_ac(b_left))
+            s_right = _sum_squared_error(_get_ac(b_right))
             if s_left > s > s_right:
                 b = b_right
                 continue

{ararpy-0.1.24 → ararpy-0.1.26}/ararpy/files/raw_file.py

@@ -25,7 +25,43 @@ from ..calc.basic import utc_dt
 
 """ Open raw data file """
 
-DEFAULT_SAMPLE_INFO = {}
+DEFAULT_SAMPLE_INFO = {
+    "ExpName": "en",        # "Experiment Name"
+    "StepName": "sn",       # "Step Name"
+    "StepType": "st",       # "Step Type"
+    "StepLabel": "sl",      # "Step Label"
+    "ZeroYear": "date",     # "Zero Date Year"
+    "ZeroHour": "time",     # "Zero Time Hour"
+    "ZeroMon": "mon",       # "Zero Date Month"
+    "ZeroMin": "min",       # "Zero Time Minute"
+    "ZeroDay": "day",       # "Zero Date Day"
+    "ZeroSec": "sec",       # "Zero Time Second"
+    "SmpName": "smpn",      # "Sample Name"
+    "SmpLoc": "smpl",       # "Sample location"
+    "SmpMatr": "smpm",      # "Sample Material"
+    "ExpType": "et",        # "Experiment Type"
+    "SmpWeight": "smpw",    # "Sample Weight"
+    "Stepunit": "su",       # "Step unit"
+    "HeatingTime": "ht",    # "Heating time"
+    "InstrName": "inn",     # "Instrument name"
+    "Researcher": "re",     # "Researcher"
+    "Analyst": "an",        # "Analyst"
+    "Lab": "la",            # "Laboratory"
+    "Jv": "jv",             # "J value"
+    "Jsig": "je",           # "J value error"
+    "MDF": "mdf",           # "MDF"
+    "MDFSig": "mdfe",       # "MDF error"
+    "CalcName": "cp",       # "Calc params"
+    "IrraName": "in",       # "Irra name"
+    "IrraLabel": "il",      # "Irra label"
+    "IrraPosH": "ih",       # "Irra position H"
+    "IrraPosX": "ix",       # "Irra position X"
+    "IrraPosY": "iy",       # "Irra position Y"
+    "StdName": "stdn",      # "Standard name"
+    "StdAge": "stda",       # "Standard age"
+    "StdAgeSig": "stde",    # "Standard age error"
+}
+
 
 
 def open_file(file_path: str, input_filter: List[Union[str, int, bool]]):
@@ -217,48 +253,27 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
     idx = step_index = 0
 
     header = input_filter[5]
-    isotopic_data_index = input_filter[8:28]
-    sample_info_index = input_filter[33:65]
-    optional_info_index = input_filter[37:-6]
-    check_box_index = input_filter[-6:]
+    isotope_index = input_filter[8:28]
+    data_index = input_filter[4:33]
+    strings_index = input_filter[33:41]         # strings: filename, parsing information, datetime, timezone
+    optional_info_index = input_filter[41:-7]       # from Exp Name to Std Age Error
+    check_box_index = input_filter[-7:]
 
-    timezone = sample_info_index[3] if sample_info_index[3] != "" else "utc"
     while True:  # measurment steps sloop
 
-        # all text information
+        # ============ all text information ============
         options = get_sample_info(file_contents, optional_info_index, default="", base=[1, 1 - idx, 1])
 
-        # Zero datetime
-        try:
-            if check_box_index[2]:  # input_filter[134]: date in one string
-                zero_date = datetime_parse(options.get('ZeroYear'), sample_info_index[1])
-            else:
-                zero_date = datetime(year=options.get('ZeroYear'), month=options.get('ZeroMon'),
-                                     day=options.get('ZeroDay'))
-
-            if check_box_index[3]:  # input_filter[135]: time in one string
-                zero_time = datetime_parse(options.get('ZeroHour'), sample_info_index[2])
-            else:
-                zero_time = datetime(year=2020, month=12, day=31, hour=options.get('ZeroHour'),
-                                     minute=options.get('ZeroMin'), second=options.get('ZeroSec'))
-
-            zero_datetime = datetime(
-                zero_date.year, zero_date.month, zero_date.day, zero_time.hour, zero_time.minute, zero_time.second)
-            # adjust to UTC
-            zero_datetime = utc_dt(zero_datetime, tz=timezone).isoformat(timespec='seconds')
-        except (TypeError, ValueError, IndexError):
-            # print(f"Cannot parse zero datetime")
-            zero_datetime = datetime(1970, 1, 1, 0, 0, 0).isoformat(timespec='seconds')
-
-        # Step name
+        # ============ Step name ============
         try:
             step_name = options.get('StepName')
             experiment_name = options.get('ExpName')
-            if check_box_index[1] and sample_info_index[0].strip() != "":
-                _res = string_parser(sample_info_index[0], file_name)
-                if _res is not None:
-                    experiment_name = _res.named.get("en", experiment_name)
-                    step_index = _res.named.get("sn", step_name)
+            if check_box_index[1] and strings_index[0].strip() != "":
+                res = string_parser(strings_index[0], file_name)
+                if res is not None and "en" in res.named.keys():
+                    experiment_name = res.named.get("en")
+                if res is not None and "sn" in res.named.keys():
+                    step_index = res.named.get("sn")
                     if step_index.isnumeric():
                         step_name = f"{experiment_name}-{int(step_index):02d}"
                     else:
@@ -273,33 +288,69 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
             options.update({'StepName': step_name})
             options.update({'ExpName': experiment_name})
 
+        # ============ Step information ============
+        try:
+            if check_box_index[2]:
+                string = get_item(file_contents, strings_index[1:4], default="", base=[1, 1 - idx, 1])
+                res = string_parser(strings_index[4], string)
+                if res is not None:
+                    options.update(dict(zip(DEFAULT_SAMPLE_INFO.keys(), [res.named.get(value, options.get(key)) for key, value in DEFAULT_SAMPLE_INFO.items()])))
+        except (TypeError, ValueError, IndexError):
+            break
+        else:
+            pass
+
+        # ============ Zero datetime ============
+        timezone = strings_index[7] if strings_index[7] != "" else "utc"
+        try:
+            if check_box_index[3]:  # date in one string
+                zero_date = datetime_parse(options.get('ZeroYear'), strings_index[5])
+            else:
+                zero_date = datetime(year=options.get('ZeroYear'), month=options.get('ZeroMon'),
+                                     day=options.get('ZeroDay'))
+
+            if check_box_index[4]:  # time in one string
+                zero_time = datetime_parse(options.get('ZeroHour'), strings_index[6])
+            else:
+                zero_time = datetime(year=2020, month=12, day=31, hour=options.get('ZeroHour'),
+                                     minute=options.get('ZeroMin'), second=options.get('ZeroSec'))
+
+            zero_datetime = datetime(
+                zero_date.year, zero_date.month, zero_date.day, zero_time.hour, zero_time.minute, zero_time.second)
+            # adjust to UTC
+            zero_datetime = utc_dt(zero_datetime, tz=timezone).isoformat(timespec='seconds')
+        except (TypeError, ValueError, IndexError):
+            # print(f"Cannot parse zero datetime")
+            zero_datetime = datetime(1970, 1, 1, 0, 0, 0).isoformat(timespec='seconds')
+
         current_step = [[step_name, zero_datetime, options]]
 
+        # ============ isotope data ============
         break_num = 0
         cycle_num = 0
-        f = float(input_filter[31])  # Intensity Scale Factor
-        data_content = file_contents[input_filter[4] - 1 if input_filter[4] != 0 else 0]
+        f = float(data_index[27])  # Intensity Scale Factor
+        data_content = file_contents[data_index[0] - 1 if data_index[0] != 0 else 0]
         for i in range(2000):  # measurement cycle sloop
-            if break_num < input_filter[29]:
+            if break_num < data_index[25]:
                 break_num += 1
                 continue
             break_num = 0
-            if int(input_filter[6]) == 0:  # == 0, vertical
-                start_row = input_filter[28] * cycle_num + input_filter[29] * cycle_num + header + idx - 1
+            if int(data_index[2]) == 0:  # == 0, vertical
+                start_row = data_index[24] * cycle_num + data_index[25] * cycle_num + header + idx - 1
                 try:
                     current_step.append([
                         str(cycle_num + 1),
                         # in sequence: Ar36, Ar37, Ar38, Ar39, Ar40
-                        float(data_content[start_row + isotopic_data_index[18]][isotopic_data_index[19] - 1]),
-                        float(data_content[start_row + isotopic_data_index[16]][isotopic_data_index[17] - 1]) * f,
-                        float(data_content[start_row + isotopic_data_index[14]][isotopic_data_index[15] - 1]),
-                        float(data_content[start_row + isotopic_data_index[12]][isotopic_data_index[13] - 1]) * f,
-                        float(data_content[start_row + isotopic_data_index[10]][isotopic_data_index[11] - 1]),
-                        float(data_content[start_row + isotopic_data_index[ 8]][isotopic_data_index[ 9] - 1]) * f,
-                        float(data_content[start_row + isotopic_data_index[ 6]][isotopic_data_index[ 7] - 1]),
-                        float(data_content[start_row + isotopic_data_index[ 4]][isotopic_data_index[ 5] - 1]) * f,
-                        float(data_content[start_row + isotopic_data_index[ 2]][isotopic_data_index[ 3] - 1]),
-                        float(data_content[start_row + isotopic_data_index[ 0]][isotopic_data_index[ 1] - 1]) * f,
+                        float(data_content[start_row + isotope_index[18]][isotope_index[19] - 1]),
+                        float(data_content[start_row + isotope_index[16]][isotope_index[17] - 1]) * f,
+                        float(data_content[start_row + isotope_index[14]][isotope_index[15] - 1]),
+                        float(data_content[start_row + isotope_index[12]][isotope_index[13] - 1]) * f,
+                        float(data_content[start_row + isotope_index[10]][isotope_index[11] - 1]),
+                        float(data_content[start_row + isotope_index[ 8]][isotope_index[ 9] - 1]) * f,
+                        float(data_content[start_row + isotope_index[ 6]][isotope_index[ 7] - 1]),
+                        float(data_content[start_row + isotope_index[ 4]][isotope_index[ 5] - 1]) * f,
+                        float(data_content[start_row + isotope_index[ 2]][isotope_index[ 3] - 1]),
+                        float(data_content[start_row + isotope_index[ 0]][isotope_index[ 1] - 1]) * f,
                     ])
                 except (ValueError, IndexError):
                     print(f"Cannot parse isotope data")
@@ -307,23 +358,23 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
                     current_step.append([
                         str(cycle_num + 1), None, None, None, None, None, None, None, None, None, None,
                     ])
-            elif int(input_filter[6]) == 1:  # == 1, horizontal
-                start_row = input_filter[5] + idx
-                col_inc = input_filter[28] * cycle_num + input_filter[29] * cycle_num - 1
+            elif int(data_index[2]) == 1:  # == 1, horizontal
+                start_row = data_index[1] + idx
+                col_inc = data_index[24] * cycle_num + data_index[25] * cycle_num - 1
                 try:
                     current_step.append([
                         str(cycle_num + 1),
                         # Ar36, Ar37, Ar38, Ar39, Ar40
-                        float(data_content[start_row][isotopic_data_index[19] + col_inc]),
-                        float(data_content[start_row][isotopic_data_index[17] + col_inc]) * f,
-                        float(data_content[start_row][isotopic_data_index[15] + col_inc]),
-                        float(data_content[start_row][isotopic_data_index[13] + col_inc]) * f,
-                        float(data_content[start_row][isotopic_data_index[11] + col_inc]),
-                        float(data_content[start_row][isotopic_data_index[ 9] + col_inc]) * f,
-                        float(data_content[start_row][isotopic_data_index[ 7] + col_inc]),
-                        float(data_content[start_row][isotopic_data_index[ 5] + col_inc]) * f,
-                        float(data_content[start_row][isotopic_data_index[ 3] + col_inc]),
-                        float(data_content[start_row][isotopic_data_index[ 1] + col_inc]) * f,
+                        float(data_content[start_row][isotope_index[19] + col_inc]),
+                        float(data_content[start_row][isotope_index[17] + col_inc]) * f,
+                        float(data_content[start_row][isotope_index[15] + col_inc]),
+                        float(data_content[start_row][isotope_index[13] + col_inc]) * f,
+                        float(data_content[start_row][isotope_index[11] + col_inc]),
+                        float(data_content[start_row][isotope_index[ 9] + col_inc]) * f,
+                        float(data_content[start_row][isotope_index[ 7] + col_inc]),
+                        float(data_content[start_row][isotope_index[ 5] + col_inc]) * f,
+                        float(data_content[start_row][isotope_index[ 3] + col_inc]),
+                        float(data_content[start_row][isotope_index[ 1] + col_inc]) * f,
                     ])
                 except (ValueError, IndexError):
                     print(f"Cannot parse isotope data")
@@ -332,14 +383,14 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
                         str(cycle_num + 1), None, None, None, None, None, None, None, None, None, None,
                     ])
             else:
-                raise ValueError(f"{input_filter[6]} not in [0, 1]")
+                raise ValueError(f"{data_index[2]} not in [0, 1]")
 
             cycle_num += 1
-            if cycle_num >= input_filter[7]:
+            if cycle_num >= data_index[3]:
                 break
 
         step_list.append(current_step)
-        idx = input_filter[32] * len(step_list)
+        idx = data_index[28] * len(step_list)
 
         if not check_box_index[0] or len(step_list) >= 500:  # check_box_index[0]: multiple sequences
             break
@@ -366,12 +417,12 @@ def get_sample_info(file_contents: list, index_list: list, default="", base: Uni
         "StepName": get_item(file_contents, index_list[3:6], default=default, base=base),
         "StepType": get_item(file_contents, index_list[6:9], default=default, base=base),
         "StepLabel": get_item(file_contents, index_list[9:12], default=default, base=base),
-        "ZeroYear": get_item(file_contents, index_list[12:15], default=default, base=base),  # year
-        "ZeroHour": get_item(file_contents, index_list[15:18], default=default, base=base),  # hour
-        "ZeroMon": get_item(file_contents, index_list[18:21], default=default, base=base),  # month
-        "ZeroMin": get_item(file_contents, index_list[21:24], default=default, base=base),  # minute
-        "ZeroDay": get_item(file_contents, index_list[24:27], default=default, base=base),  # day
-        "ZeroSec": get_item(file_contents, index_list[27:30], default=default, base=base),  # second
+        "ZeroYear": get_item(file_contents, index_list[12:15], default=default, base=base),
+        "ZeroHour": get_item(file_contents, index_list[15:18], default=default, base=base),
+        "ZeroMon": get_item(file_contents, index_list[18:21], default=default, base=base),
+        "ZeroMin": get_item(file_contents, index_list[21:24], default=default, base=base),
+        "ZeroDay": get_item(file_contents, index_list[24:27], default=default, base=base),
+        "ZeroSec": get_item(file_contents, index_list[27:30], default=default, base=base),
         "SmpName": get_item(file_contents, index_list[30:33], default=default, base=base),
         "SmpLoc": get_item(file_contents, index_list[33:36], default=default, base=base),
         "SmpMatr": get_item(file_contents, index_list[36:39], default=default, base=base),
@@ -385,46 +436,16 @@ def get_sample_info(file_contents: list, index_list: list, default="", base: Uni
         "Lab": get_item(file_contents, index_list[60:63], default=default, base=base),
         "Jv": get_item(file_contents, index_list[63:66], default=default, base=base),
         "Jsig": get_item(file_contents, index_list[66:69], default=default, base=base),
-        "CalcName": get_item(file_contents, index_list[69:72], default=default, base=base),
-        "IrraName": get_item(file_contents, index_list[72:75], default=default, base=base),
-        "IrraLabel": get_item(file_contents, index_list[75:78], default=default, base=base),
-        "IrraPosH": get_item(file_contents, index_list[78:81], default=default, base=base),
-        "IrraPosX": get_item(file_contents, index_list[81:84], default=default, base=base),
-        "IrraPosY": get_item(file_contents, index_list[84:87], default=default, base=base),
-        "StdName": get_item(file_contents, index_list[87:90], default=default, base=base),
-        "StdAge": get_item(file_contents, index_list[90:93], default=default, base=base),
-        "StdAgeSig": get_item(file_contents, index_list[93:96], default=default, base=base),
-        # "Experiment Name": get_item(file_contents, sample_info_index[0:3], default=default, base=base),
-        # "Step Name": get_item(file_contents, sample_info_index[3:6], default=default, base=base),
-        # "Step Type": get_item(file_contents, sample_info_index[6:9], default=default, base=base),
-        # "Step Label": get_item(file_contents, sample_info_index[9:12], default=default, base=base),
-        # "Zero Date Year": get_item(file_contents, sample_info_index[12:15], default=default, base=base),
-        # "Zero Time Hour": get_item(file_contents, sample_info_index[15:18], default=default, base=base),
-        # "Zero Date Month": get_item(file_contents, sample_info_index[18:21], default=default, base=base),
-        # "Zero Time Minute": get_item(file_contents, sample_info_index[21:24], default=default, base=base),
-        # "Zero Date Day": get_item(file_contents, sample_info_index[24:27], default=default, base=base),
-        # "Zero Time Second": get_item(file_contents, sample_info_index[27:30], default=default, base=base),
-        # "Sample Name": get_item(file_contents, sample_info_index[30:33], default=default, base=base),
-        # "Sample location": get_item(file_contents, sample_info_index[33:36], default=default, base=base),
-        # "Sample Material": get_item(file_contents, sample_info_index[36:39], default=default, base=base),
-        # "Experiment Type": get_item(file_contents, sample_info_index[39:42], default=default, base=base),
-        # "Sample Weight": get_item(file_contents, sample_info_index[42:45], default=default, base=base),
-        # "Step unit": get_item(file_contents, sample_info_index[45:48], default=default, base=base),
-        # "Heating time": get_item(file_contents, sample_info_index[48:51], default=default, base=base),
-        # "Instrument name": get_item(file_contents, sample_info_index[51:54], default=default, base=base),
-        # "Researcher": get_item(file_contents, sample_info_index[54:57], default=default, base=base),
-        # "Analyst": get_item(file_contents, sample_info_index[57:60], default=default, base=base),
-        # "Laboratory": get_item(file_contents, sample_info_index[60:63], default=default, base=base),
-        # "J value": get_item(file_contents, sample_info_index[63:66], default=default, base=base),
-        # "J value error": get_item(file_contents, sample_info_index[66:69], default=default, base=base),
-        # "Calc params": get_item(file_contents, sample_info_index[69:72], default=default, base=base),
-        # "Irra name": get_item(file_contents, sample_info_index[72:75], default=default, base=base),
-        # "Irra label": get_item(file_contents, sample_info_index[75:78], default=default, base=base),
-        # "Irra position H": get_item(file_contents, sample_info_index[78:81], default=default, base=base),
-        # "Irra position X": get_item(file_contents, sample_info_index[81:84], default=default, base=base),
-        # "Irra position Y": get_item(file_contents, sample_info_index[84:87], default=default, base=base),
-        # "Standard name": get_item(file_contents, sample_info_index[87:90], default=default, base=base),
-        # "Standard age": get_item(file_contents, sample_info_index[90:93], default=default, base=base),
-        # "Standard age error": get_item(file_contents, sample_info_index[93:96], default=default, base=base),
+        "MDF": get_item(file_contents, index_list[69:72], default=default, base=base),
+        "MDFSig": get_item(file_contents, index_list[72:75], default=default, base=base),
+        "CalcName": get_item(file_contents, index_list[75:78], default=default, base=base),
+        "IrraName": get_item(file_contents, index_list[78:81], default=default, base=base),
+        "IrraLabel": get_item(file_contents, index_list[81:84], default=default, base=base),
+        "IrraPosH": get_item(file_contents, index_list[84:87], default=default, base=base),
+        "IrraPosX": get_item(file_contents, index_list[87:90], default=default, base=base),
+        "IrraPosY": get_item(file_contents, index_list[90:93], default=default, base=base),
+        "StdName": get_item(file_contents, index_list[93:96], default=default, base=base),
+        "StdAge": get_item(file_contents, index_list[96:99], default=default, base=base),
+        "StdAgeSig": get_item(file_contents, index_list[99:102], default=default, base=base),
     })
     return sample_info

{ararpy-0.1.24 → ararpy-0.1.26}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.1.24 → ararpy-0.1.26}/setup.py

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