ararpy 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.34'
+version = '0.1.36'
 __version__ = version
 full_version = version
-last_update = '2025-10-22'
+last_update = '2025-12-08'
 
 """ ArArPy Functions """
 

ararpy/calc/basic.py

@@ -10,8 +10,7 @@
 #
 """
 import copy
-import random
-import string
+import secrets
 import numpy as np
 from scipy import stats
 from datetime import datetime, timezone, timedelta
@@ -100,8 +99,8 @@ def update_dicts(a: dict, b: dict):
     return res
 
 
-def get_random_digits(length: int = 7) -> str:
-    return ''.join(random.choices(string.digits, k=length))
+def get_random_string(length: int = 8) -> str:
+    return secrets.token_hex(max(int(length/2), 1))
 
 
 def monte_carlo(func, inputs, confidence_level, **kwargs):

ararpy/calc/raw_funcs.py

@@ -30,8 +30,8 @@ def get_raw_data_regression_results(points_data, unselected: list = None):
 
     """
     def power(a0, a1):
-        return regression.power(a0, a1)
-        # raise ValueError("Deprecated regression")
+        # return regression.power(a0, a1)
+        raise ValueError("Deprecated regression")
     # if unselected is None:
     #     unselected = []
     # linesData = []
@@ -42,9 +42,9 @@ def get_raw_data_regression_results(points_data, unselected: list = None):
         power, regression.average]
     # size = 50
     # lines_x = [(max(x + un_x) - 0) / size * i for i in range(size + 1)]
+    x, y = transpose(points_data, ignore=False)
     for i in range(len(reg_handler)):
         try:
-            x, y = transpose(points_data, ignore=False)
             res = reg_handler[i](a0=y, a1=x)
             # line_data = transpose([lines_x, res[7](lines_x)])
             line_results = res[0:4]

ararpy/calc/regression.py

@@ -16,7 +16,7 @@ import traceback
 import numpy as np
 import pandas as pd
 from scipy.stats import distributions
-from scipy.optimize import fsolve
+from scipy.optimize import minimize_scalar
 import warnings
 from scipy.optimize import minimize
 warnings.simplefilter(action="ignore", category=RuntimeWarning)
@@ -495,16 +495,19 @@ def linest(a0: list, a1: list, *args):
     # calculate Y values base on the fitted formula
     estimate_y = np.matmul(x, beta)
     resid = (estimate_y - y) ** 2
-    reg = (estimate_y - np.mean(estimate_y)) ** 2
-    ssresid = resid.sum()
-    ssreg = reg.sum()
-    sstotal = ssreg + ssresid
+    reg = (estimate_y - np.mean(y)) ** 2
+    ssresid = resid.sum()  # 残差平方和
+    ssreg = reg.sum()  # 回归平方和
+    sstotal = ((y - np.mean(y)) ** 2).sum()
+    r2 = ssreg / sstotal if sstotal != 0 else np.inf
+
     df = m - n
-    m_ssresid = ssresid / df
-    se_beta = (m_ssresid * np.diagonal(inv_xtx)) ** .5
-    beta = beta.transpose()[0]
+    m_ssresid = ssresid / df  # 均方残差，与加权平均中的MSWD对应
+    cov_beta = m_ssresid * inv_xtx
+    se_beta = np.diagonal(cov_beta) ** .5
+
+    beta = beta.flatten()
     rse_beta = se_beta / beta
-    r2 = ssreg / sstotal if sstotal != 0 else np.inf
 
     def get_adjusted_y(*args):
         args = [[1] * len(args[0]), *args]
@@ -538,7 +541,7 @@ def average(a0: list, a1=None):
     k1 = pow(sum([(i - k0) ** 2 for i in a0]) / df, 0.5)  # standard deviation
     k2 = k1 / k0 * 100 if k0 != 0 else 0  # relative standard error
     k3 = r2  # determination coefficient
-    k4 = 'MSWD'
+    k4 = m_ssresid  # 'MSWD'
     k5 = [k0]
     k6 = [k1]
     k8 = m_ssresid
@@ -869,92 +872,101 @@ def power(a0: list, a1: list):
 
 
 def exponential(a0: list, a1: list):
-    """
-    :param a0: known_y's, y = a * b ^ x + c
-    :param a1: known_x's
-    :return: intercept | standard error of intercept | relative error | R2 | MSWD | [m, c, b] | [sem, sec, seb]
-    """
 
-    def _exp_func(x, a, b, c):
-        return a * b ** x + c
+    X = np.array(a1)
+    Y = np.array(a0)
+    y = np.array([a0]).transpose()
 
-    def _residuals(params):
-        a, b, c = params
-        return [_exp_func(xi, a, b, c) - yi for xi, yi in zip(a1, a0)]
+    def _exp_func(xi, a, b, c):
+        return a * np.exp(b * xi) + c
 
-    def _sum_squared_error(params):
-        return sum(r**2 for r in _residuals(params))
+    @np.vectorize
+    def _get_s(b):
+        x = np.concatenate(([np.ones(len(a1))], [np.exp(b * np.array(a1))]), axis=0).transpose()
+        try:
+            inv_xtx = np.linalg.inv(np.matmul(x.transpose(), x))
+        except np.linalg.LinAlgError:
+            raise np.linalg.LinAlgError(f"The determinant of the given matrix must not be zero ")
+        beta = np.matmul(inv_xtx, np.matmul(x.transpose(), y))
+        c, a = beta.flatten()
+        reg_y = _exp_func(X, a, b, c)
+        resid = (reg_y - Y) ** 2
+        ssresid = sum(resid)
+        return ssresid
 
-    def _get_ac(b):
-        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
+    ini_f = linest(np.log(Y), X)
+    ini_b = ini_f[5][1]
 
+    # 替换原来的 minimize_scalar 部分
     try:
-        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 = _sum_squared_error([a, b, c])
-            b_left, b_right = b - step * b, b + step * b
-            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
-            elif s_left < s < s_right:
-                b = b_left
-                continue
-            elif s_left < s_right:
-                b = (b + b_left) / 2
-            else:
-                b = (b + b_right) / 2
-            count += 1
-            step = step * 0.5
-            if step < 0.000001:
-                break
+        b, count = newton_minimize_1d(_get_s, x0=ini_b, h=1e-5, tol=1e-8, max_iter=30)
+    except Exception as e:
+        # 使用 scipy 一维优化
+        res = minimize_scalar(_get_s, bounds=(-2, 2), method='bounded', options={'xatol': 1e-8})
+        b, count = res.x, res.nfev
 
-    except RuntimeError:
-        raise RuntimeError
-    except np.linalg.LinAlgError:
-        raise np.linalg.LinAlgError
-    except TypeError:
-        raise TypeError
-    except IndexError:
-        raise IndexError
-
-    f = linest(a0, [b ** _x for _x in a1])
-    a, sea, c, sec = f[5][1], f[6][1], f[0], f[1]
+    # print(f"{b = }, {count = }")
 
-    calculated_y = [_exp_func(i, a, b, c) for i in a1]
-    resid = [(calculated_y[i] - a0[i]) ** 2 for i in range(len(a0))]
-    reg = [(i - sum(calculated_y) / len(calculated_y)) ** 2 for i in calculated_y]
-    ssresid = sum(resid)
-    ssreg = sum(reg)
-    sstotal = ssreg + ssresid
-    dp = len(a1)
-    df = dp - 1
-    m_ssresid = ssresid / df
+    x = np.concatenate(([np.ones(len(a1))], [np.exp(b * np.array(a1))]), axis=0).transpose()
+    m, n = x.shape  # number of data, number of unknown x
+    try:
+        inv_xtx = np.linalg.inv(np.matmul(x.transpose(), x))
+    except np.linalg.LinAlgError:
+        raise np.linalg.LinAlgError(f"The determinant of the given matrix must not be zero ")
+    beta = np.matmul(inv_xtx, np.matmul(x.transpose(), y))
+    estimate_y = np.matmul(x, beta)
+    resid = (estimate_y - y) ** 2
+    reg = (estimate_y - np.mean(y)) ** 2
+    ssresid = resid.sum()  # 残差平方和
+    ssreg = reg.sum()  # 回归平方和
+    sstotal = ((y - np.mean(y)) ** 2).sum()
     r2 = ssreg / sstotal if sstotal != 0 else 1
 
-    z = [b ** i for i in a1]
+    df = m - n
+    m_ssresid = ssresid / df  # 均方残差，与加权平均中的MSWD对应
+    cov_beta = m_ssresid * inv_xtx
+
+    sc, sa = np.diagonal(cov_beta) ** .5
+    c, a = beta.flatten()
     intercept = a + c
-    se_intercept_1 = np.sqrt(sea ** 2 + sec ** 2)
-    # calculate error of intercept
-    errfz = pow(sum([i ** 2 for i in z]) / (dp * sum([i ** 2 for i in z]) - sum(z) ** 2), 0.5)
-    errfx = pow(sum([i ** 2 for i in a1]) / (dp * sum([i ** 2 for i in a1]) - sum(a1) ** 2), 0.5)
-    # seb = errfz * sey = errfz * ssresid / df -> se_intercept = sey * errfx = seb / errfz * errfx
-    se_intercept = sec / errfz * errfx
-    rse_intercept = se_intercept / intercept * 100
+    se_intercept = pow(sa ** 2 + sc ** 2 + 2 * cov_beta[0][1] , 0.5)
 
-    return intercept, se_intercept, rse_intercept, r2, 'mswd', [a, b, c], 'se', \
-           lambda x: [_exp_func(i, a, b, c) for i in x], m_ssresid
+    return intercept, se_intercept, se_intercept / intercept * 100, r2, m_ssresid, [a, b, c], 'se', \
+           lambda x: [_exp_func(xi, a, b, c) for xi in x], m_ssresid
+
+
+def newton_minimize_1d(func, x0, h=1e-5, tol=1e-8, max_iter=20):
+    x = x0
+    for i in range(max_iter):
+        fx = func(x)
+        if not np.isfinite(fx):
+            raise ValueError("Newton Minimize: Function returned non-finite value at x={}".format(x))
+
+        # 一阶导数（中心差分）
+        f_plus = func(x + h)
+        f_minus = func(x - h)
+        if not (np.isfinite(f_plus) and np.isfinite(f_minus)):
+            raise ValueError("Newton Minimize: Non-finite values in derivative computation")
+
+        df = (f_plus - f_minus) / (2 * h)
+        d2f = (f_plus - 2 * fx + f_minus) / (h * h)
+
+        # 牛顿步长
+        if abs(d2f) < 1e-12:  # 避免除零或平坦区域
+            print("Newton Minimize: Second derivative too small, stopping.")
+            break
+
+        step = df / d2f
+        x_new = x - step
+
+        if abs(step) < tol:
+            x = x_new
+            break
+
+        x = x_new
 
+    return x, i + 1
 
 """ line functions """
 

ararpy/files/basic.py

@@ -12,31 +12,9 @@
 
 import os
 import pickle
-import traceback
 import json
 
 
-def upload(file, media_dir):
-    try:
-        name, suffix = os.path.splitext(file.name)
-        if suffix.lower() not in [
-            '.xls', '.age', '.xlsx', '.arr', '.jpg', '.png', '.txt',
-            '.log', '.seq', '.json', '.ahd', '.csv', '.ngxdp']:
-            raise TypeError(f"The imported file is not supported: {suffix}")
-        web_file_path = os.path.join(media_dir, file.name)
-        with open(web_file_path, 'wb') as f:
-            for chunk in file.chunks():
-                f.write(chunk)
-        print("File path on the server: %s" % web_file_path)
-    except PermissionError:
-        raise ValueError(f'Permission denied')
-    except (Exception, BaseException) as e:
-        print(traceback.format_exc())
-        raise ValueError(f'Error in opening file: {e}')
-    else:
-        return web_file_path, name, suffix
-
-
 def read(file_path):
     """ Read text files, default 'r', 'rb'
     Parameters

ararpy/files/calc_file.py

@@ -493,40 +493,41 @@ def open_full_xls(file_path: str, sample_name: str = ''):
         res['Inverse Isochron Table'], rows, [4, 5, 6, 7, 10])
     total_param = arr.partial(
         res['Sample Parameters'], rows, [
-            # 1, 2,  # 0-1
-            -1, -1, -1, -1,  # 2-5
-            -1, -1, -1, -1,  # 6-9
-            -1, -1, -1, -1, -1, -1,  # 10-15
-            -1, -1, -1, -1,  # 16-19
-            -1, -1,  # 20-21
-            23, 24, -1, -1, -1, -1,  # 22-27
-            -1, -1,  # 28-29
-            22, -1, -1, -1,  # 30-33
-            -1, -1,  # 34-35
-            -1, -1,  # 36-37
-            -1, -1,  # 38-39
-            -1, -1,  # 40-41
-            -1, -1,  # 42-43
-            -1, -1,  # 44-45
-            -1, -1,  # 46-47
-            -1, -1,  # 48-49
-            -1, -1,  # 50-51
-            -1, -1,  # 52-53
-            -1, -1,  # 54-55
-            -1, -1,  # 56-57
-            -1, -1,  # 58-59
-            -1, -1, -1, -1, -1, -1, -1, -1, -1,  # 60-68
-            10, 11, 12, 13,  # 69-72
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  # 73-84
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  # 85-94
-            -1, -1, -1, -1,  # 95-98
-            -1, -1, -1, -1,  # 99-102
-            -1, -1, -1, -1,  # 103-106
-            -1, -1, -1, -1,  # 107-110
-            -1, -1, -1, -1,  # 111-114
-            -1, -1, -1, -1, -1, -1, -1, -1,  # 115-122
-            -1, -1, -1, -1, -1, -1, -1, -1,  # 123-130
-            -1, -1, -1, -1, -1,  # 131-135
+            # 1, 2, -1, # 0-2
+            -1, -1, -1, -1,  # 3-6
+            -1, -1, -1, -1,  # 7-10
+            -1, -1, -1, -1, -1, -1,  # 11-16
+            -1, -1, -1, -1,  # 17-20
+            -1, -1,  # 21-22
+            23, 24, -1, -1, -1, -1,  # 23-28
+            -1, -1,  # 29-30
+            22, -1, -1, -1,  # 31-34
+            -1, -1,  # 35-36
+            -1, -1,  # 37-38
+            -1, -1,  # 39-40
+            -1, -1,  # 41-42
+            -1, -1,  # 43-44
+            -1, -1,  # 45-46
+            -1, -1,  # 47-48
+            -1, -1,  # 49-50
+            -1, -1,  # 51-52
+            -1, -1,  # 53-54
+            -1, -1,  # 55-56
+            -1, -1,  # 57-58
+            -1, -1,  # 59-60
+            -1, -1, -1, -1, -1, -1, -1, -1, -1,  # 61-69
+            10, 11, 12, 13,  # 70-73
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  # 74-85
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  # 86-95
+            -1, -1, -1, -1,  # 96-99
+            -1, -1, -1, -1,  # 100-103
+            -1, -1, -1, -1,  # 104-107
+            -1, -1, -1, -1,  # 108-111
+            -1, -1, -1, -1,  # 112-115
+            -1, -1, -1, -1, -1, -1, -1, -1,  # 116-123
+            -1, -1, -1, -1, -1, -1, -1, -1,  # 124-131
+            -1, -1, -1, -1, -1,  # 132-136
+            -1, -1, -1, -1,  # 137-140
         ])
 
     month_convert = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06',

ararpy/files/raw_file.py

@@ -65,7 +65,7 @@ DEFAULT_SAMPLE_INFO = {
 
 
 
-def open_file(file_path: str, input_filter: List[Union[str, int, bool]]):
+def open_file(file_path: str, input_filter: List[Union[str, int, bool]], name=None):
     """
     Parameters
     ----------
@@ -94,63 +94,14 @@ def open_file(file_path: str, input_filter: List[Union[str, int, bool]]):
     """
     extension = str(os.path.split(file_path)[-1]).split('.')[-1]
     try:
-        handler = {'txt': open_raw_txt, 'excel': open_raw_xls,
-                   'Qtegra Exported XLS': open_qtegra_exported_xls, 'Seq': open_raw_seq}[
-            ['txt', 'excel', 'Qtegra Exported XLS', 'Seq'][int(input_filter[1])]]
+        handler = {'txt': open_raw_txt, 'excel': open_raw_xls, 'Seq': open_raw_seq}[
+            ['txt', 'excel', 'Qtegra Excel (deleted)', 'Seq'][int(input_filter[1])]]
     except KeyError:
         raise FileNotFoundError("Wrong File.")
-    return handler(file_path, input_filter)
+    return handler(file_path, input_filter, name)
 
 
-def open_qtegra_exported_xls(filepath, input_filter=None):
-    if input_filter is None:
-        input_filter = []
-    try:
-        wb = open_workbook(filepath)
-        sheets = wb.sheet_names()
-        sheet = wb.sheet_by_name(sheets[0])
-        value, step_header, step_list = [], [], []
-        for row in range(sheet.nrows):
-            row_set = []
-            for col in range(sheet.ncols):
-                if sheet.cell(row, col).value == '':
-                    pass
-                else:
-                    row_set.append(sheet.cell(row, col).value)
-            if row_set != [] and len(row_set) > 1:
-                value.append(row_set)
-        for each_row in value:
-            # if the first item of each row is float (1.0, 2.0, ...) this row is the header of a step.
-            if isinstance(each_row[0], float):
-                each_row[0] = int(each_row[0])
-                if "M" in each_row[1].upper():
-                    each_row[1] = datetime.strptime(each_row[1], '%m/%d/%Y  %I:%M:%S %p').isoformat(timespec='seconds')
-                else:
-                    each_row[1] = datetime.strptime(each_row[1], '%m/%d/%Y  %H:%M:%S').isoformat(timespec='seconds')
-                step_header.append(each_row)
-        for step_index, each_step_header in enumerate(step_header):
-            row_start_number = value.index(each_step_header)
-            try:
-                row_stop_number = value.index(step_header[step_index + 1])
-            except IndexError:
-                row_stop_number = len(value) + 1
-            step_values = [
-                each_step_header[0:4],
-                *list(map(
-                    # lambda x: [x[0], x[1], x[2], x[1], x[3], x[1], x[4], x[1], x[5], x[1], x[6]],
-                    # x[1] = time, x[2] = H2:40, x[3] = H1: 39, x[4] = AX: 38, x[5] = L1: 37, x[6] = L2: 36
-                    lambda x: [x[0], x[1], x[6], x[1], x[5], x[1], x[4], x[1], x[3], x[1], x[2]],
-                    # in sequence: Ar36, Ar37, Ar38, Ar39, Ar40
-                    [value[i] for i in range(row_start_number + 2, row_stop_number - 7, 1)]))
-            ]
-            step_list.append(step_values)
-    except Exception as e:
-        raise ValueError('Error in opening the original file: %s' % str(e))
-    else:
-        return {'data': step_list}
-
-
-def open_raw_txt(file_path, input_filter: List[Union[str, int]]):
+def open_raw_txt(file_path, input_filter: List[Union[str, int]], name=None):
     """
     Parameters
     ----------
@@ -173,12 +124,12 @@ def open_raw_txt(file_path, input_filter: List[Union[str, int]]):
         lines = [line.strip().split(['\t', ';', " ", ",", input_filter[3]][int(input_filter[2])])
                  for line in contents.decode(encoding=encoding["encoding"]).split('\r\n')]
 
-    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1])
+    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1]) if name is None else name
     step_list = get_raw_data([lines], input_filter, file_name=file_name)
     return {'data': step_list}
 
 
-def open_raw_xls(file_path, input_filter: List[Union[str, int]]):
+def open_raw_xls(file_path, input_filter: List[Union[str, int]], name):
     """
     Parameters
     ----------
@@ -205,13 +156,13 @@ def open_raw_xls(file_path, input_filter: List[Union[str, int]]):
 
     wb = open_workbook(file_path)
     contents = [_get_content_from_sheet(i) for i in range(100)]
-    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1])
+    file_name = os.path.basename(file_path).rstrip(os.path.splitext(file_path)[-1]) if name is None else name
     step_list = get_raw_data(contents, input_filter, file_name=file_name)
 
     return {'data': step_list}
 
 
-def open_raw_seq(file_path, input_filter=None):
+def open_raw_seq(file_path, input_filter=None, name=None):
 
     class RenameUnpickler(pickle.Unpickler):
         def find_class(self, module: str, name: str):
@@ -257,20 +208,29 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
 
     """
 
-    def datetime_parse(string, f):
+    def datetime_parse(string: str, f: str):
         try:
             return datetime.strptime(string, f)
         except ValueError as v:
+            print(traceback.format_exc())
             if f.strip() == "":
                 return datetime_parser.parse(string)
             elif len(v.args) > 0 and v.args[0].startswith('unconverted data remains: '):
-                string = string[:-(len(v.args[0]) - 26)]
-                return datetime.strptime(string, f)
+                # %f handles microseconds (6 digits), remove the remains
+                return datetime_parse(string[:-(len(v.args[0]) - 26)], f)
+            # elif f.upper()[-2:] in ['PM', 'AM']:
+            #     return datetime_parse(string, f[:-2])
             else:
                 raise
 
+    def step_num_parse(s: str):
+        try:
+            return f"{round(float(s)):02d}"
+        except (ValueError, TypeError):
+            return s
+
     step_list = []
-    idx = step_index = 0
+    idx = 0  # step_index
 
     header = input_filter[5]
     isotope_index = input_filter[8:28]
@@ -293,13 +253,10 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
                 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:
-                        step_name = f"{experiment_name}-{step_index}"
-            if step_name == "":
-                raise ValueError(f"Step name not found")
+                    step_name = res.named.get("sn")
+            if str(step_name) == "":
+                raise ValueError(f"Step name not found, break reading steps")
+            step_name = f"{experiment_name}-{step_num_parse(step_name)}"
         except (TypeError, ValueError, IndexError):
             # When parsing the step name fails, the end of the file has been reached
             # raise
@@ -417,7 +374,7 @@ def get_raw_data(file_contents: List[List[Union[int, float, str, bool, list]]],
         step_list.append(current_step)
         idx = data_index[28] * len(step_list)
         if not check_box_index[0] or len(step_list) >= 500:  # check_box_index[0]: multiple sequences
-            print(f"Multiple Sequence = {check_box_index[0]}, Step number = {len(step_list)}")
+            # print(f"Multiple Sequence = {check_box_index[0]}, Step number = {len(step_list)}")
             break
 
     if not step_list:

ararpy/smp/diffusion_funcs.py

@@ -4436,7 +4436,7 @@ def get_random_dir(path: str, length=7, random_index=""):
     try:
         exist_ok = random_index != ""
         if random_index == "":
-            random_index = calc.basic.get_random_digits(length=length)
+            random_index = calc.basic.get_random_string(length=length)
         destination_folder = os.path.join(path, random_index)
         os.makedirs(destination_folder, exist_ok=exist_ok)
         return destination_folder, random_index

ararpy/smp/export.py

@@ -23,7 +23,7 @@ from math import log
 from decimal import Decimal
 
 from ..calc import arr, isochron, spectra, err
-from ..calc.basic import get_random_digits, merge_dicts
+from ..calc.basic import get_random_string, merge_dicts
 from ..calc.plot import get_axis_scale
 from . import basic, sample, consts
 
@@ -329,8 +329,8 @@ def getRectFromSpectra(data):
 
 def _get_additional_text_series(name):
     return {
-        'type': 'text', 'id': f'text-{name}-{get_random_digits()}',
-        'name': f'text-{name}-{get_random_digits()}', 'color': 'black',
+        'type': 'text', 'id': f'text-{name}-{get_random_string()}',
+        'name': f'text-{name}-{get_random_string()}', 'color': 'black',
         'text': "", 'size': title_size,
         'data': [[50, 50]], 'axis_index': 1,
         'h_align': "middle", 'v_align': "center",
@@ -353,7 +353,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     X = x + list(reversed(x))
     Y = y1 + list(reversed(y2))
     series.append({
-        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
         'color': color, 'fill_color': color, 'line_width': line_width, 'line_style': 'solid', 'z_index': 19,
         'data': np.transpose([X, Y]).tolist(),
         'line_caps': line_caps,
@@ -373,7 +373,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             # 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)
             series.append({
-                'type': 'series.rect', 'id': f'rect-{smp.name()}-{get_random_digits()}', 'name': f'rect-{smp.name()}-{get_random_digits()}',
+                'type': 'series.rect', 'id': f'rect-{smp.name()}-{get_random_string()}', 'name': f'rect-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],   'line_style': 'none', 'z_index': 9,
                 'data': spectra_fill_data, 'line_caps': 'none', 'fill': True,
                 'axis_index': 0,
@@ -382,8 +382,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             X = x + list(reversed(x))
             Y = y1 + list(reversed(y2))
             series.append({
-                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-                'name': f'line-{smp.name()}-{get_random_digits()}',
+                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+                'name': f'line-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
                 'data': np.transpose([X, Y]).tolist(),
                 'line_caps': line_caps,
@@ -392,8 +392,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             })
             # plateau line
             series.append({
-                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-                'name': f'line-{smp.name()}-{get_random_digits()}',
+                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+                'name': f'line-{smp.name()}-{get_random_string()}',
                 'color': '#A9A9A9', 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
                 'data': [[0, res['age']], [100, res['age']]],
                 'line_caps': line_caps,
@@ -401,7 +401,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
                 'axis_index': 0,
             })
             series.append({
-                'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+                'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],
                 'text': f"Corrected = {res['age']:.2f} ± {(sigma * res['s2']):.2f} {unit} ({sigma}s)<r>"
                         f"MSWD = {res['MSWD']:.2f}, n = {res['Num']:.0f}<r>"
@@ -416,8 +416,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
         spe = smp.Info.results.age_spectra[index]
         if not np.isnan(res['age']):
             series.append({
-                'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}',
-                'name': f'text-{smp.name()}-{get_random_digits()}',
+                'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}',
+                'name': f'text-{smp.name()}-{get_random_string()}',
                 'color': color, 'fill_color': color,
                 'text': f"WMPA = {spe['age']:.2f} ± {(sigma * spe['s2']):.2f} {unit} ({sigma}s)",
                 'size': title_size,
@@ -431,7 +431,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     tga = smp.Info.results.age_spectra['TGA']
     if not np.isnan(tga['age']):
         series.append({
-            'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+            'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
             'color': color, 'fill_color': color,
             'text': f"TGA = {tga['age']:.2f} ± {(sigma * tga['s2']):.2f} {unit} ({sigma}s)",
             'size': title_size,
@@ -455,7 +455,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     # print(f"{min_index = }")
 
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
         'color': color, 'fill_color': color,
         'text': f"Max. = {age[max_index, 0]:.2f} ± {(sigma * age[max_index, 2]):.2f} {unit}",
         'size': title_size,
@@ -466,7 +466,7 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     })
 
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
         'color': color, 'fill_color': color,
         'text': f"Min. = {age[min_index, 0]:.2f} ± {(sigma * age[min_index, 2]):.2f} {unit}",
         'size': title_size,
@@ -477,8 +477,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     })
 
     series.append({
-        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-        'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+        'name': f'line-{smp.name()}-{get_random_string()}',
         'color': '#A9A9A9', 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
         'data': [[0, age[max_index, 0]], [100, age[max_index, 0]]],
         'line_caps': line_caps,
@@ -486,8 +486,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
         'axis_index': 0,
     })
     series.append({
-        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}',
-        'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}',
+        'name': f'line-{smp.name()}-{get_random_string()}',
         'color': '#A9A9A9', 'line_width': line_width, 'line_style': 'solid', 'z_index': 9,
         'data': [[0, age[min_index, 0]], [100, age[min_index, 0]]],
         'line_caps': line_caps,
@@ -496,8 +496,8 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
     })
     # title
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}',
-        'name': f'text-{smp.name()}-{get_random_digits()}', 'color': color,
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}',
+        'name': f'text-{smp.name()}-{get_random_string()}', 'color': color,
         'text': smp.name(), 'size': title_size,
         'data': [[50, 95]], 'axis_index': 1, 'z_index': 29,
         'h_align': "middle", 'v_align': "center",
@@ -624,21 +624,21 @@ def _get_plot_data_inv_isochron_series(smp: sample, **options):
     set3 = smp.InvIsochronPlot.set3.data
     # set 1
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': colors_map['red'], 'fill_color': colors_map['red80'], 'myType': 'scatter', 'size': marker_size, 'line_width': 0,
         'data': (data[[0, 2], :][:, set1]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99
     })
     # set 2
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': colors_map['blue'], 'fill_color': colors_map['blue80'], 'myType': 'scatter', 'size': marker_size, 'line_width': 0,
         'data': (data[[0, 2], :][:, set2]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99
     })
     # set 3
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': 'black', 'fill_color': 'white', 'myType': 'scatter', 'size': marker_size, 'line_width': 0,
         'data': (data[[0, 2], :][:, set3]).transpose().tolist(),
         'axis_index': 0, 'z_index': 0
@@ -653,14 +653,14 @@ def _get_plot_data_inv_isochron_series(smp: sample, **options):
                             (float(xAxis[0]['extent'][1]), float(xAxis[0]['extent'][1]) * smp.Info.results.isochron['figure_3'][index]['m1'] + smp.Info.results.isochron['figure_3'][index]['k']),
             ]
             series.append({
-                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+                'type': 'series.line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],
                 'line_width': 1, 'line_style': 'solid',
                 'data': isochron_data,
                 'axis_index': 0,
             })
             series.append({
-                'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}', 'name': f'text-{smp.name()}-{get_random_digits()}',
+                'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}', 'name': f'text-{smp.name()}-{get_random_string()}',
                 'color': [colors_map['red'], colors_map['blue']][index], 'fill_color': [colors_map['red'], colors_map['blue']][index],
                 'text': f"IIA = {smp.Info.results.isochron['figure_3'][index]['age']:.2f} ± {(sigma * smp.Info.results.isochron['figure_3'][index]['s2']):.2f} Ma ({sigma}s)<r>"
                         f"(40Ar/36Ar)0 = {smp.Info.results.isochron['figure_3'][index]['initial']:.2f} ± {(sigma * smp.Info.results.isochron['figure_3'][index]['sinitial']):.2f}<r>"
@@ -673,8 +673,8 @@ def _get_plot_data_inv_isochron_series(smp: sample, **options):
             })
 
     series.append({
-        'type': 'text', 'id': f'text-{smp.name()}-{get_random_digits()}',
-        'name': f'text-{smp.name()}-{get_random_digits()}', 'color': color,
+        'type': 'text', 'id': f'text-{smp.name()}-{get_random_string()}',
+        'name': f'text-{smp.name()}-{get_random_string()}', 'color': color,
         'text': smp.name(), 'size': title_size,
         'data': [[50, 95]], 'axis_index': 1,
         'h_align': "middle", 'v_align': "center",
@@ -695,7 +695,7 @@ def _get_plot_data_degas_pattern(smp: sample, **options):
     data = np.array([x, y])
     # set 1
     series.append({
-        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_digits()}', 'name': f'scatter-{smp.name()}-{get_random_digits()}',
+        'type': 'series.scatter', 'id': f'scatter-{smp.name()}-{get_random_string()}', 'name': f'scatter-{smp.name()}-{get_random_string()}',
         'stroke_color': color, 'fill_color': 'white', 'myType': 'scatter', 'size': 4, 'line_width': 1,
         'data': data.transpose().tolist(), 'axis_index': 0, 'z_index': 99
     })
@@ -787,7 +787,7 @@ def _get_plot_data_degas_spectra_series(smp: sample, **options):
 
     # set 1
     series.append({
-        'type': 'rect', 'id': f'rect-{smp.name()}-{get_random_digits()}', 'name': f'rect-{smp.name()}-{get_random_digits()}',
+        'type': 'rect', 'id': f'rect-{smp.name()}-{get_random_string()}', 'name': f'rect-{smp.name()}-{get_random_string()}',
         'color': color, 'myType': 'rect', 'line_width': 1,
         'data': data.transpose().tolist(),
         'axis_index': 0, 'z_index': 99
@@ -844,13 +844,13 @@ def _get_plot_data_degas_curve_series(smp: sample, **options):
 
     # line
     series.append({
-        'type': 'line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
         'color': color, 'myType': 'line', 'line_width': 1, 'line_style': 'solid',
         'data': np.array([x, released]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99
     })
     series.append({
-        'type': 'line', 'id': f'line-{smp.name()}-{get_random_digits()}', 'name': f'line-{smp.name()}-{get_random_digits()}',
+        'type': 'line', 'id': f'line-{smp.name()}-{get_random_string()}', 'name': f'line-{smp.name()}-{get_random_string()}',
         'color': color, 'myType': 'line', 'line_width': 1, 'line_style': 'solid',
         'data': np.array([x, remained]).transpose().tolist(),
         'axis_index': 0, 'z_index': 99

ararpy/smp/raw.py

@@ -22,7 +22,7 @@ RawData = samples.RawData
 Sequence = samples.Sequence
 
 
-def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[str]], **kwargs):
+def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[str]], file_name=None, **kwargs):
     """ Read raw data from files, can create raw data instance based on the given files
     Raw data will have the structure like:
         [
@@ -35,6 +35,7 @@ def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[
     ----------
     file_path
     input_filter_path
+    file_name
     kwargs
 
     Returns
@@ -42,21 +43,16 @@ def to_raw(file_path: Union[str, List[str]], input_filter_path: Union[str, List[
 
     """
     if isinstance(file_path, list) and isinstance(input_filter_path, list):
-        raw = concatenate([to_raw(file, input_filter_path[index]) for index, file in enumerate(file_path)])
+        raw = concatenate([to_raw(file, input_filter_path[index],
+            file_name[index] if isinstance(file_name, list) else file_name) for index, file in enumerate(file_path)])
     elif isinstance(file_path, str) and isinstance(input_filter_path, str):
         input_filter = read_params(input_filter_path)
-        file_name = str(os.path.split(file_path)[-1]).split('.')[0]
-        res = raw_file.open_file(file_path, input_filter)
+        file_name = str(os.path.split(file_path)[-1]).split('.')[0] if file_name is None else file_name
+        res = raw_file.open_file(file_path, input_filter, file_name)
         data = res.get('data', None)
         sequences = res.get('sequences', None)
         sequence_num = len(data) if data is not None else len(sequences)
-        # default fitting method, all exponential
-        # <option value=0>Linear</option>
-        # <option value=1>Quadratic</option>
-        # <option value=2>Exponential</option>
-        # <option value=3>Power</option>
-        # <option value=4>Average</option>
-        fitting_method = [2, 0, 2, 2, 2]
+        fitting_method = [2, 0, 2, 2, 2]  # 0 - linear, 1 - quadratic, 2 - exponential, 3 - power, 4 - average
         raw = RawData(name=file_name, data=data, isotopic_num=10, sequence_num=sequence_num, source=[file_path],
                       sequence=sequences, unit=str(input_filter[30]), fitting_method=[*fitting_method])
     else:

ararpy/smp/sample.py

@@ -109,67 +109,67 @@ ISOCHRON_TABLE_HEADERS = [
 TOTAL_PARAMS_HEADERS = [
     'Sequence', '', 'Mark',  # 0-2
     '(\u2074\u2070Ar/\u00B3\u2076Ar)t', '%1\u03C3',
-    '(\u2074\u2070Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 2-5
+    '(\u2074\u2070Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 3-6
     '(\u00B3\u2078Ar/\u00B3\u2076Ar)t', '%1\u03C3',
-    '(\u00B3\u2078Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 6-9
+    '(\u00B3\u2078Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 7-10
     '(\u00B3\u2079Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',
     '(\u00B3\u2078Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',
-    '(\u00B3\u2076Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',  # 10-15
+    '(\u00B3\u2076Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',  # 11-16
     '(\u2074\u2070Ar/\u00B3\u2079Ar)K', '%1\u03C3',
-    '(\u00B3\u2078Ar/\u00B3\u2079Ar)K', '%1\u03C3',  # 16-19
-    '(\u00B3\u2076Ar/\u00B3\u2078Ar)Cl', '%1\u03C3',  # 20-21
-    'K/Ca', '%1\u03C3', 'K/Cl', '%1\u03C3', 'Ca/Cl', '%1\u03C3',  # 22-27
-    'Cycle Number', 'Irradiation Cycles',  # 28-29
-    'Irradiation', 'duration', 'Irradiation Time', 'Experiment Time',  # 30-33
-    'Storage Years', '',  # 34-35
-    'Decay Constant \u2074\u2070K', '%1\u03C3',  # 36-37
-    'Decay Constant \u2074\u2070K(EC)', '%1\u03C3',  # 38-39
-    'Decay Constant \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 40-41
-    'Decay Constant \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 42-43
-    'Decay Constant \u00B3\u2079Ar', '%1\u03C3',  # 44-45
-    'Decay Constant \u00B3\u2077Ar', '%1\u03C3',  # 46-47
-    'Decay Constant \u00B3\u2076Cl', '%1\u03C3',  # 48-49
-    'Decay Activity \u2074\u2070K', '%1\u03C3',  # 50-51
-    'Decay Activity \u2074\u2070K(EC)', '%1\u03C3',  # 52-53
-    'Decay Activity \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 54-55
-    'Decay Activity \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 56-57
-    '\u00B3\u2076Cl/\u00B3\u2078Cl Productivity', '%1\u03C3',  # 58-59
-    'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',  # 60-66
-    '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3',  # 67-68
-    'J', '%1\u03C3', 'MDF', '%1\u03C3',  # 69-72
-    'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',  # 73-76
-    'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',  # 77-80
-    'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3',  # 81-84
+    '(\u00B3\u2078Ar/\u00B3\u2079Ar)K', '%1\u03C3',  # 17-20
+    '(\u00B3\u2076Ar/\u00B3\u2078Ar)Cl', '%1\u03C3',  # 21-22
+    'K/Ca', '%1\u03C3', 'K/Cl', '%1\u03C3', 'Ca/Cl', '%1\u03C3',  # 23-28
+    'Cycle Number', 'Irradiation Cycles',  # 29-30
+    'Irradiation', 'duration', 'Irradiation Time', 'Experiment Time',  # 31-34
+    'Storage Years', '',  # 35-36
+    'Decay Constant \u2074\u2070K', '%1\u03C3',  # 37-38
+    'Decay Constant \u2074\u2070K(EC)', '%1\u03C3',  # 39-40
+    'Decay Constant \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 41-42
+    'Decay Constant \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 43-44
+    'Decay Constant \u00B3\u2079Ar', '%1\u03C3',  # 45-46
+    'Decay Constant \u00B3\u2077Ar', '%1\u03C3',  # 47-48
+    'Decay Constant \u00B3\u2076Cl', '%1\u03C3',  # 49-50
+    'Decay Activity \u2074\u2070K', '%1\u03C3',  # 51-52
+    'Decay Activity \u2074\u2070K(EC)', '%1\u03C3',  # 53-54
+    'Decay Activity \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 55-56
+    'Decay Activity \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 57-58
+    '\u00B3\u2076Cl/\u00B3\u2078Cl Productivity', '%1\u03C3',  # 59-60
+    'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',  # 61-67
+    '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3',  # 68-69
+    'J', '%1\u03C3', 'MDF', '%1\u03C3',  # 70-73
+    'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',  # 74-77
+    'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',  # 78-81
+    'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3',  # 82-85
     'No', '%1\u03C3', 'Year', '%1\u03C3', '\u2074\u2070K/K', '%1\u03C3',
-    '\u00B3\u2075Cl/\u00B3\u2077Cl', '%1\u03C3', 'HCl/Cl', '%1\u03C3',  # 85-94
-    '\u2074\u2070Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 95-96
-    '\u00B3\u2078Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 97-98
-    'Isochron Fitting', 'Convergence', 'Iteration', 'Discrimination',  # 99-102
-    'Not Zero', 'Corr Blank', 'Corr Discr', 'Corr \u00B3\u2077Ar Decay',  # 103-106
-    'Corr \u00B3\u2079Ar Decay',  # 107
-    'Ca Degassing', 'K Degassing', 'Cl Degassing', 'Trap Degassing',  # 108-111
-    'Using Min Equation',  # 112
+    '\u00B3\u2075Cl/\u00B3\u2077Cl', '%1\u03C3', 'HCl/Cl', '%1\u03C3',  # 86-95
+    '\u2074\u2070Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 96-97
+    '\u00B3\u2078Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 98-99
+    'Isochron Fitting', 'Convergence', 'Iteration', 'Discrimination',  # 100-103
+    'Not Zero', 'Corr Blank', 'Corr Discr', 'Corr \u00B3\u2077Ar Decay',  # 104-107
+    'Corr \u00B3\u2079Ar Decay',  # 108
+    'Ca Degassing', 'K Degassing', 'Cl Degassing', 'Trap Degassing',  # 109-112
+    'Using Min Equation',  # 113
     # 'Recalibration', 'Using Std Age', 'Use Std Ratio',  # 112-115  to be completed
-    'Apply Gain Corr to Blanks',  # 113
-    '', '',  # 114-115
-    'Auto Plateau Method',  # 116 the index includes sequence name and unit
-    'Initial Ratio Model',  # 117
-    'Set1 initial Ratio',  # 118
-    '1\u03C3',  # 119
-    'Set2 initial Ratio',  # 120
-    '1\u03C3',  # 121
-    'Isotopic Errors',  # 122
-    'Parameter Errors',  # 123
-    'Plot Errors',  # 124
-    'Heating Time (s)',  # 125
-    'Heating Actual Temp (C)',  # 126
-    'Heating AT 1\u03C3',  # 127
-    '36Ar Gain', '%1\u03C3',  # 128-129
-    '37Ar Gain', '%1\u03C3',  # 130-131
-    '38Ar Gain', '%1\u03C3',  # 132-133
-    '39Ar Gain', '%1\u03C3',  # 134-135
-    '40Ar Gain', '%1\u03C3',  # 136-137
-    'Normalize Factor', '1\u03C3',  # 138-139
+    'Apply Gain Corr to Blanks',  # 114
+    '', '',  # 115-116
+    'Auto Plateau Method',  # 117 the index includes sequence name and unit
+    'Initial Ratio Model',  # 118
+    'Set1 initial Ratio',  # 119
+    '1\u03C3',  # 120
+    'Set2 initial Ratio',  # 121
+    '1\u03C3',  # 122
+    'Isotopic Errors',  # 123
+    'Parameter Errors',  # 124
+    'Plot Errors',  # 125
+    'Heating Time (s)',  # 126
+    'Heating Actual Temp (C)',  # 127
+    'Heating AT 1\u03C3',  # 128
+    '36Ar Gain', '%1\u03C3',  # 129-130
+    '37Ar Gain', '%1\u03C3',  # 131-132
+    '38Ar Gain', '%1\u03C3',  # 133-134
+    '39Ar Gain', '%1\u03C3',  # 135-136
+    '40Ar Gain', '%1\u03C3',  # 137-138
+    'Normalize Factor', '1\u03C3',  # 139-140
 ]
 
 SAMPLE_INTERCEPT_SHORT_HEADERS = [

{ararpy-0.1.34.dist-info → ararpy-0.1.36.dist-info}/METADATA

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

{ararpy-0.1.34.dist-info → ararpy-0.1.36.dist-info}/RECORD

@@ -5,20 +5,20 @@ ararpy/Example - Show MDD results.py,sha256=YFkiQual60lyCClsfvivr4REY6waSYuomf0u
 ararpy/Example - Show all Kfs age spectra.py,sha256=1edPtBpFfS0lC7vLnLu34mDHt_xjbc8ptk6rZ--pf-I,12304
 ararpy/Example - Show random walk results.py,sha256=8WWvbAI7ySiMR-XwtFe5kTQihW3mcqzL3S7EUZdoxYo,15477
 ararpy/Example - Tc calculation.py,sha256=sD9pu3IaZ8mBV95rV2wOEhlQUexFNqBUoBqnNMdUBis,19617
-ararpy/__init__.py,sha256=lBvc-oTc0Js1bMrGGgXnmSRTJPqkJrqa-vOWCawlPXE,6857
+ararpy/__init__.py,sha256=mVCcRD0R0FoAL0Q6u9paujSfaQ8YBP8A_FXELRXO5AI,6857
 ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
 ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
 ararpy/calc/age.py,sha256=WOZs70zXiBWDIEhXJLIaNiYTOFJNk0NDbH5e5zCbCks,5435
 ararpy/calc/arr.py,sha256=jD1Fd0Cj3xc7NqgnG4cp3VWQWxUlV0qCtPBZZokDG8o,15246
-ararpy/calc/basic.py,sha256=fVpdXmyqcIUU26nhU1bnI-YK4ZQ4Qqk24P3Yi9YwUwI,4187
+ararpy/calc/basic.py,sha256=X8BoAjZgk52WfAbhOCUTEOkDIdSuz21gepN-Xke4oGA,4165
 ararpy/calc/corr.py,sha256=QDitvLf6y5IBpHtVEJfOUVjWSlIP9qJ4Jhluk9eDEDE,18801
 ararpy/calc/err.py,sha256=63LtprqjemlIb1QGDst4Ggcv5KMSDHdlAIL-nyQs1eA,2691
 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=Hdtb-q18xYC8ZJeDKGRauCSbj4_7e6Z8HQs9aYgfvao,2139
-ararpy/calc/raw_funcs.py,sha256=GJ0VW0sc2qPIVp5jSDmPP1ClOoYRa_cc35ye7QDYOiI,2744
-ararpy/calc/regression.py,sha256=lWMoZkovtj5OEYM8eT0FcMsGrDIkKm9rsG45ru3IVuk,39798
+ararpy/calc/raw_funcs.py,sha256=Rza1nIBQCOlJK_X0XvzmJqNG_byuaZxotNbdM84M-gI,2736
+ararpy/calc/regression.py,sha256=3L6caRhAptWY7o3EGGk5sfB_C471crSUcwOQRrkLS7Q,40255
 ararpy/calc/spectra.py,sha256=_Q23eP9necHlaCoHf3_UfW1N3JmVZj5rcWFro8GS-CA,1995
 ararpy/examples/022_VU124-M11a.ahd,sha256=3m0Gd-ZObou3KsnRNFMf77QwzT1Uz3nu3vA33Sqeyng,5414
 ararpy/examples/20WHA0103.age,sha256=cT-a4d7Wt77aotx6v0G47vulY_TZIcZUcaVHB3pqTPM,380416
@@ -41,10 +41,10 @@ ararpy/examples/raw_example.xls,sha256=ftcSiXRx_7nYnbqJVma1Yl3Yr_iuceAWlEjhJwlAv
 ararpy/examples/sample-default.smp,sha256=YNkoQGgPrsL_fXS7ZHxfRtLQWekCDqT9czS6vBScImk,432
 ararpy/files/__init__.py,sha256=l5B5ZQ01WdtvjjN0aMkyAFNgpwANdM_1I0tQbqnRuEY,69
 ararpy/files/arr_file.py,sha256=pD5MxkAydL7cNq2wmKFUaOU4jHhc3MzTYrwbxZ3f46w,881
-ararpy/files/basic.py,sha256=mGYP7QJBtyasVAYcwT0a9k6tPlcStxASddgzbaxYKkE,2105
-ararpy/files/calc_file.py,sha256=RrfMo7Q8-4pBMQdpGY0guF52aSqAk8LEjq2NE3toL2w,28734
+ararpy/files/basic.py,sha256=k2GXgZjhqSmKvpXQLjsXDksS_ZLvqD7AWW54fXnYvTI,1228
+ararpy/files/calc_file.py,sha256=bapIVd3QQBprdMdfxNbY8TJH1UkfphIUtim3ONypc3I,28779
 ararpy/files/new_file.py,sha256=efblARIBROVLWS2w3-98BxLX5VZ8grRpiTkJFtf_rAk,214
-ararpy/files/raw_file.py,sha256=3vGinbUyTWyQ57jMFIuckrPkN0TrNe1hqKCOAWaj70A,21854
+ararpy/files/raw_file.py,sha256=IwU_1Urrk0FjOt3kUuOaYjBBFozhCVAdsP6STxRia-o,19778
 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
@@ -52,22 +52,22 @@ ararpy/smp/basic.py,sha256=PMvlSoToY8CJEORRrhEo4rYM2-VfSmjg0IuDpGFOGUM,24899
 ararpy/smp/calculation.py,sha256=LCFJWjLVLEKEQ5b7RFUIxsMahEzgLdodW4kCYXV5Z34,2919
 ararpy/smp/consts.py,sha256=XIdjdz8cYxspG2jMnoItdlUsxr3hKbNFJjMZJh1bpzw,393
 ararpy/smp/corr.py,sha256=U5K1Vld55IHea_fZ7EEY_8dkvjp0f6OhpdSxf7b9WGY,26551
-ararpy/smp/diffusion_funcs.py,sha256=q0kl-AYx7TYeWc1kruKLOl4U4JosIuf1uNmkps11eUs,186694
-ararpy/smp/export.py,sha256=mWnnNg7DYIxcxyqeGXAWUS7faJmO7UHwnMVPX33_aLg,120638
+ararpy/smp/diffusion_funcs.py,sha256=NC5T0GYXCidgVqSy3BGmIroLWzQhyzYb5x4gg_L0dJ4,186694
+ararpy/smp/export.py,sha256=yAUlTvFBo2U703hZ79NlAcTYC7QZGXHUn_IRP7sQuRA,120638
 ararpy/smp/info.py,sha256=iKUELm-BuUduDlJKC1d8tKKNHbwwbNmhUg2pi6bcBvA,489
 ararpy/smp/initial.py,sha256=QGk7vh7JyVqalwnpd9VudQoX2Z9tyWzfIIw_cL5Sok0,18031
 ararpy/smp/json.py,sha256=BTZCjVN0aj9epc700nwkYEYMKN2lHBYo-pLmtnz5oHY,2300
 ararpy/smp/plots.py,sha256=fFuJxoFcnvGSysjdEdrbW_ITpukt0iGs2K25gshIKNU,33594
-ararpy/smp/raw.py,sha256=51n-rrbW2FqeZHQyevuG7iObPLGvIBzTe414QDVM1FE,6523
-ararpy/smp/sample.py,sha256=iaFjG0S0GuNwbLeUFpzEFIbqa0oX0KekRZuLJd2mSCQ,58903
+ararpy/smp/raw.py,sha256=SeKaNZZRWjiE_7fMHwn1IgQxX17t8mNFYMnRiimMLRU,6474
+ararpy/smp/sample.py,sha256=HW2JIZZcNslYVQupAqlfLEKXBWdYol5Xpx0PDdPG44o,58905
 ararpy/smp/style.py,sha256=Q8f6SsqnxmzocxpZUyGDiNanVW0ijCZpxHKh19UIeoM,7800
 ararpy/smp/table.py,sha256=Vq3GK9aslEuBhmvlQoUHjcs71Q6raSFYqd5veB1L9mk,6887
 ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=ncw9DtxRfS6zlQbLVLNX7WNoO9sX_nSomwAsTH0_O3k,25910
 ararpy/thermo/basic.py,sha256=JJRZbYmvXlpRAV2FeFPwLhrig4ZhNQmJnWqgOjo-1YQ,11508
-ararpy-0.1.34.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.1.34.dist-info/METADATA,sha256=ZOHvn2PDOQXK_B4Dy0XlzzY0KoxaXraCH-I8u67YQmM,24516
-ararpy-0.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ararpy-0.1.34.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.1.34.dist-info/RECORD,,
+ararpy-0.1.36.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.1.36.dist-info/METADATA,sha256=z82ivzCqiDnDN8TjnGAk1EmL4-C_YLhhY99WFbLnw3Y,24516
+ararpy-0.1.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ararpy-0.1.36.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.1.36.dist-info/RECORD,,