ararpy 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

ararpy/smp/initial.py

@@ -16,7 +16,7 @@ import pandas as pd
 import numpy as np
 import copy
 from typing import List, Union, Optional
-from ..calc import arr
+from ..calc import arr, err
 from ..files import calc_file
 from . import (sample as samples, basic, table, raw as smp_raw)
 
@@ -141,7 +141,8 @@ def initial(smp: Sample):
     setattr(smp, 'Info', ArArBasic(
         id='0', name='info', attr_name='Info', arr_version=samples.VERSION,
         sample=ArArBasic(
-            name='SAMPLE NAME', material='MATERIAL', location='LOCATION', type='Unknown'
+            name='SAMPLE NAME', material='MATERIAL', location='LOCATION', type='Unknown', method='',
+            sequence_unit='', weight=''
         ),
         researcher=ArArBasic(
             name='RESEARCHER', addr='ADDRESS', email='EMAIL'
@@ -182,7 +183,10 @@ def initial(smp: Sample):
         reference=ArArBasic(
             name='REFERENCE', journal='JOURNAL', doi='DOI'
         ),
-        preference=copy.deepcopy(PREFERENCE_RES)
+        preference=copy.deepcopy(PREFERENCE_RES),
+        experiment=ArArBasic(
+            name='', mass_spec='', collectors='', step_num=0
+        ),
     ))
 
     decimal_places = PREFERENCE_RES['decimalPlaces']
@@ -233,7 +237,7 @@ def initial(smp: Sample):
     return smp
 
 
-def initial_plot_styles(sample: Sample, except_attrs=None):
+def initial_plot_styles(smp: Sample, except_attrs=None):
     """
     Initialize plot components styles based on Default Styles. Except attrs is a list containing attrs
     that are not expected to be initialized.
@@ -257,17 +261,26 @@ def initial_plot_styles(sample: Sample, except_attrs=None):
             for k, v in value.items():
                 set_attr(getattr(obj, name), k, v)
 
-    default_styles = copy.deepcopy(samples.DEFAULT_PLOT_STYLES)
+    default_styles = get_default_plot_style(smp)
     for figure_index, figure_attr in default_styles.items():
-        plot = getattr(sample, figure_attr['attr_name'], Plot())
+        plot = getattr(smp, figure_attr['attr_name'], Plot())
         for key, attr in figure_attr.items():
             set_attr(plot, key, attr)
 
 
-def re_set_smp(sample: Sample):
+def get_default_plot_style(smp: Sample):
+    sample_type = smp.Info.sample.type
+    try:
+        age_unit = str(smp.Info.preference['ageUnit']).capitalize()
+    except:
+        age_unit = "Undefined"
+    return copy.deepcopy(samples.DEFAULT_PLOT_STYLES(sample_type, age_unit))
+
+
+def re_set_smp(smp: Sample):
     std = initial(Sample())
-    basic.get_merged_smp(sample, std)
-    return sample
+    basic.get_merged_smp(smp, std)
+    return check_version(smp)
 
 
 def check_version(smp: Sample):
@@ -282,7 +295,28 @@ def check_version(smp: Sample):
 
     """
     if smp.version != samples.VERSION:
-        re_set_smp(smp)
+        std = initial(Sample())
+        basic.get_merged_smp(smp, std)
+
+    # 20250328:  # Experiment info
+    smp.Info.experiment.name = smp.name()
+    smp.Info.experiment.step_num = smp.sequence().size
+
+    # 20250404
+    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]
+    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))]
+    ]
     return smp
 
 
@@ -328,11 +362,8 @@ def from_arr_files(file_path, sample_name: str = ""):
     def renamed_load(file_obj):
         return RenameUnpickler(file_obj).load()
 
-    try:
-        with open(file_path, 'rb') as f:
-            sample = renamed_load(f)
-    except (Exception, BaseException):
-        raise ValueError(f"Fail to open arr file: {file_path}")
+    with open(file_path, 'rb') as f:
+        sample = renamed_load(f)
     # Check arr version
     # recalculation will not be applied automatically
     return check_version(sample)
@@ -352,7 +383,7 @@ def from_calc_files(file_path: str, **kwargs):
     """
     file = calc_file.ArArCalcFile(file_path=file_path, **kwargs).open()
     sample = create_sample_from_df(file.get_content(), file.get_smp_info())
-    return sample
+    return check_version(sample)
 
 
 # create
@@ -371,7 +402,7 @@ def from_full_files(file_path: str, sample_name: str = None):
         sample_name = str(os.path.split(file_path)[-1]).split('.')[0]
     content, sample_info = calc_file.open_full_xls(file_path, sample_name)
     sample = create_sample_from_dict(content=content, smp_info=sample_info)
-    return sample
+    return check_version(sample)
 
 
 # create
@@ -449,4 +480,4 @@ def from_raw_data(raw: RawData, mapping: Optional[List[dict]] = None) -> Sample:
 
     # sample.TotalParam[31] = [raw.get_sequence(row['unknown'], flag='name').datetime for row in mapping]
 
-    return sample
+    return check_version(sample)

ararpy/smp/plots.py

@@ -89,27 +89,27 @@ def set_plot_data(sample: Sample, isInit: bool = True, isIsochron: bool = True,
 # =======================
 # Initialize plot data
 # =======================
-def initial_plot_data(sample: Sample):
+def initial_plot_data(smp: Sample):
     """
     Assign initial data for plots
     Parameters
     ----------
-    sample : Sample instance
+    smp : Sample instance
 
     Returns
     -------
     None
     """
     for key, val in ISOCHRON_INDEX_DICT.items():
-        figure = basic.get_component_byid(sample, key)
+        figure = basic.get_component_byid(smp, key)
         try:
             # data = [x, sx, y, sy, (z, sz,) r1, (r2, r3,), index from 1]
-            figure.data = sample.IsochronValues[val['data_index'][0]:val['data_index'][1]] + \
-                          [[i + 1 for i in range(len(sample.SequenceName))]]
+            figure.data = smp.IsochronValues[val['data_index'][0]:val['data_index'][1]] + \
+                          [[i + 1 for i in range(len(smp.SequenceName))]]
         except (Exception, BaseException):
             print(traceback.format_exc())
             figure.data = [[]] * (val['data_index'][1] - val['data_index'][0]) + \
-                          [[i + 1 for i in range(len(sample.SequenceName))]]
+                          [[i + 1 for i in range(len(smp.SequenceName))]]
         finally:
             # Ellipse
             if key != 'figure_7':
@@ -122,51 +122,62 @@ def initial_plot_data(sample: Sample):
     # Set age spectra lines
     # Try to calculate total gas age
     try:
-        a0, e0 = sum(sample.DegasValues[24]), pow(sum([i ** 2 for i in sample.DegasValues[25]]), 0.5)
-        a1, e1 = sum(sample.DegasValues[20]), pow(sum([i ** 2 for i in sample.DegasValues[21]]), 0.5)
+        if str(smp.Info.sample.type).lower() == "unknown":
+            a0, e0 = sum(smp.DegasValues[24]), pow(sum([i ** 2 for i in smp.DegasValues[25]]), 0.5)
+            a1, e1 = sum(smp.DegasValues[20]), pow(sum([i ** 2 for i in smp.DegasValues[21]]), 0.5)
+            handle = basic.calc_age
+        elif str(smp.Info.sample.type).lower() == "standard":
+            a0, e0 = sum(smp.DegasValues[24]), pow(sum([i ** 2 for i in smp.DegasValues[25]]), 0.5)
+            a1, e1 = sum(smp.DegasValues[20]), pow(sum([i ** 2 for i in smp.DegasValues[21]]), 0.5)
+            handle = basic.calc_j
+        elif str(smp.Info.sample.type).lower() == "air":
+            a0, e0 = sum(smp.DegasValues[26]), pow(sum([i ** 2 for i in smp.DegasValues[27]]), 0.5)
+            a1, e1 = sum(smp.DegasValues[ 0]), pow(sum([i ** 2 for i in smp.DegasValues[ 1]]), 0.5)
+            handle = basic.calc_mdf
+        else:
+            raise TypeError(f"Sample type is not supported: {smp.Info.sample.type}")
         total_f = [a0 / a1, calc.err.div((a0, e0), (a1, e1))]
-        total_age = basic.calc_age(total_f[:2], smp=sample)
+        total_age = handle(total_f[:2], smp=smp)
     except (Exception, BaseException):
         print(traceback.format_exc())
         total_f = [np.nan] * 2
         total_age = [np.nan] * 4
-    sample.Info.results.age_spectra['TGA'].update(
+    smp.Info.results.age_spectra['TGA'].update(
         {'Ar39': 100, 'F': total_f[0], 'sF': total_f[1], 'age': total_age[0],
-         's1': total_age[1], 's2': total_age[2], 's3': total_age[3], 'Num': len(sample.DegasValues[24])}
+         's1': total_age[1], 's2': total_age[2], 's3': total_age[3], 'Num': len(smp.DegasValues[24])}
     )
     try:
-        sample.AgeSpectraPlot.data = calc.spectra.get_data(
-            *sample.ApparentAgeValues[2:4], sample.ApparentAgeValues[7])
-        sample.AgeSpectraPlot.data = calc.arr.transpose(sample.AgeSpectraPlot.data)
+        smp.AgeSpectraPlot.data = calc.spectra.get_data(*smp.ApparentAgeValues[2:4], smp.ApparentAgeValues[7])
+        smp.AgeSpectraPlot.data = calc.arr.transpose(smp.AgeSpectraPlot.data)
     except (Exception, BaseException):
         print(traceback.format_exc())
-        sample.AgeSpectraPlot.data = []
+        smp.AgeSpectraPlot.data = []
 
     # Degassing plot
     try:
-        if not hasattr(sample, 'DegasPatternPlot'):
-            setattr(sample, 'DegasPatternPlot', Plot(id='figure_8', name='Degas Pattern Plot'))
+        if not hasattr(smp, 'DegasPatternPlot'):
+            setattr(smp, 'DegasPatternPlot', Plot(id='figure_8', name='Degas Pattern Plot'))
         isotope_percentage = lambda l: [e / sum(l) * 100 if sum(l) != 0 else 0 for e in l]
-        sample.DegasPatternPlot.data = [
-            isotope_percentage(sample.DegasValues[0]),  # Ar36a
-            isotope_percentage(sample.DegasValues[8]),  # Ar37Ca
-            isotope_percentage(sample.DegasValues[10]),  # Ar38Cl
-            isotope_percentage(sample.DegasValues[20]),  # Ar39K
-            isotope_percentage(sample.DegasValues[24]),  # Ar40r
-            isotope_percentage(sample.CorrectedValues[0]),  # Ar36
-            isotope_percentage(sample.CorrectedValues[2]),  # Ar37
-            isotope_percentage(sample.CorrectedValues[4]),  # Ar38
-            isotope_percentage(sample.CorrectedValues[6]),  # Ar39
-            isotope_percentage(sample.CorrectedValues[8]),  # Ar40
+        smp.DegasPatternPlot.data = [
+            isotope_percentage(smp.DegasValues[0]),  # Ar36a
+            isotope_percentage(smp.DegasValues[8]),  # Ar37Ca
+            isotope_percentage(smp.DegasValues[10]),  # Ar38Cl
+            isotope_percentage(smp.DegasValues[20]),  # Ar39K
+            isotope_percentage(smp.DegasValues[24]),  # Ar40r
+            isotope_percentage(smp.CorrectedValues[0]),  # Ar36
+            isotope_percentage(smp.CorrectedValues[2]),  # Ar37
+            isotope_percentage(smp.CorrectedValues[4]),  # Ar38
+            isotope_percentage(smp.CorrectedValues[6]),  # Ar39
+            isotope_percentage(smp.CorrectedValues[8]),  # Ar40
         ]
-        sample.DegasPatternPlot.info = [True] * 10
+        smp.DegasPatternPlot.info = [True] * 10
     except Exception as e:
         print(traceback.format_exc())
         pass
 
     # Set age distribution plot data
     try:
-        recalc_agedistribution(sample)
+        recalc_agedistribution(smp)
     except Exception as e:
         print(traceback.format_exc())
 
@@ -315,11 +326,9 @@ def get_3D_results(data: list, sequence: list, sample: Sample):
         age = basic.calc_age([f, sf], smp=sample)
     except:
         # print(f"Warning: {traceback.format_exc()}")
-        k = [0] * 15
-        age = [0] * 4
-        ar40ar36, sar40ar36, P = 0, 0, 0
-        f, sf = 0, 0
-    iso_res.update(dict(zip(iso_res, [*k, *age, np.nan, ar40ar36, sar40ar36, P, f, sf])))
+        pass
+    else:
+        iso_res.update(dict(zip(iso_res, [*k, *age, np.nan, ar40ar36, sar40ar36, P, f, sf])))
     return iso_res
 
 
@@ -392,7 +401,7 @@ def recalc_plateaus(sample: Sample, **kwargs):
     if sample.Info.sample.type == "Standard":
         return recalc_j_plateaus(sample, **kwargs)
     if sample.Info.sample.type == "Air":
-        return recalc_j_plateaus(sample, **kwargs)
+        return recalc_mdf_plateaus(sample, **kwargs)
 
 
 def recalc_age_plateaus(sample: Sample, **kwargs):
@@ -407,6 +416,9 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
     -------
     None
     """
+    ar39k, sar39k = calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor)
+    ar40r, sar40r = sample.DegasValues[24:26]
+    ar40rar39k = calc.arr.div([ar40r, sar40r], [ar39k, sar39k])
     params_initial_ratio = calc.arr.partial(sample.TotalParam, cols=list(range(115, 120)))
     ratio_set1 = [[], []]
     ratio_set2 = [[], []]
@@ -432,10 +444,12 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
             ratio_set2[0].append(298.56)
             ratio_set2[1].append(0.31)
 
-    # Get ages and line data points for each set
+    # Weighted mean ages of two sets with the given initial ratios
     try:
-        set1_res, set1_age, set1_data = \
-            get_plateau_results(sample, sample.SelectedSequence1, calc_ar40ar39(*ratio_set1, smp=sample), **kwargs)
+        set1_res, set1_age, set1_data = get_plateau_results(
+            sample, sample.SelectedSequence1, calc_ar40ar39(*ratio_set1, smp=sample),
+            ar39k_percentage=np.array(ar39k) / np.sum(ar39k),
+            **kwargs)
     except ValueError:
         # print(traceback.format_exc())
         pass
@@ -445,8 +459,10 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
         sample.AgeSpectraPlot.set1.data = calc.arr.transpose(set1_data)
         sample.AgeSpectraPlot.text1.text = ""  # 注意和js的配合，js那边根据text是否为空判断是否重新生成文字
     try:
-        set2_res, set2_age, set2_data = \
-            get_plateau_results(sample, sample.SelectedSequence2, calc_ar40ar39(*ratio_set2, smp=sample), **kwargs)
+        set2_res, set2_age, set2_data = get_plateau_results(
+            sample, sample.SelectedSequence2, calc_ar40ar39(*ratio_set2, smp=sample),
+            ar39k_percentage=np.array(ar39k) / np.sum(ar39k),
+            **kwargs)
     except ValueError:
         # print(traceback.format_exc())
         pass
@@ -456,16 +472,18 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
         sample.AgeSpectraPlot.set2.data = calc.arr.transpose(set2_data)
         sample.AgeSpectraPlot.text2.text = ""  # 注意和js的配合，js那边根据text是否为空判断是否重新生成文字
 
-    # Get weighted mean ages of two sets
+    # Weighted mean ages of two sets with 298.56 (defoult air ratio)
     try:
-        set1_res = get_wma_results(sample, sample.SelectedSequence1)
+        set1_res = get_wma_results(
+            sample, sample.SelectedSequence1, ar40rar39k=ar40rar39k, ar39k_percentage=np.array(ar39k) / np.sum(ar39k))
     except ValueError:
         pass
         # raise ValueError(f"Set 1 WMA calculation error.")
     else:
         sample.Info.results.age_spectra.update({0: set1_res})
     try:
-        set2_res = get_wma_results(sample, sample.SelectedSequence2)
+        set2_res = get_wma_results(
+            sample, sample.SelectedSequence2, ar40rar39k=ar40rar39k, ar39k_percentage=np.array(ar39k) / np.sum(ar39k))
     except ValueError:
         pass
         # raise ValueError(f"Set 2 WMA calculation error.")
@@ -545,6 +563,41 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
     # # """end"""
 
 
+def recalc_mdf_plateaus(sample: Sample, **kwargs):
+    """
+    Calculate age plateaus results
+    Parameters
+    ----------
+    sample : sample instance
+    kwargs : optional args, keys in [r1, sr1, r2, sr2]
+
+    Returns
+    -------
+    None
+    """
+    ar36a, sar36a = calc.arr.mul(sample.DegasValues[0:2], sample.NormalizeFactor)
+    ar40aar36a = sample.ApparentAgeValues[0:2]
+    mdf = sample.ApparentAgeValues[2:4]
+
+    try:
+        set1_res, _, set1_data = get_plateau_results(sample, sample.SelectedSequence1, ar40rar39k=ar40aar36a)
+    except ValueError:
+        pass
+    else:
+        sample.Info.results.age_plateau.update({0: set1_res})
+        sample.AgeSpectraPlot.set1.data = calc.arr.transpose(set1_data)
+        sample.AgeSpectraPlot.text1.text = ""
+
+    try:
+        set2_res, _, set2_data = get_plateau_results(sample, sample.SelectedSequence2, ar40rar39k=ar40aar36a)
+    except ValueError:
+        pass
+    else:
+        sample.Info.results.age_plateau.update({1: set2_res})
+        sample.AgeSpectraPlot.set2.data = calc.arr.transpose(set2_data)
+        sample.AgeSpectraPlot.text2.text = ""
+
+
 def calc_ar40ar39(r, sr, smp):
     """
     Calculate Ar40r / Ar39K based on passed initial ratio.
@@ -560,7 +613,7 @@ def calc_ar40ar39(r, sr, smp):
     """
     try:
         ar36a = np.array(smp.DegasValues[0:2])
-        ar39k = smp.DegasValues[20:22]
+        ar39k = calc.arr.mul(smp.DegasValues[20:22], smp.NormalizeFactor)
         ar40 = smp.CorrectedValues[8:10]
         ar40k = smp.DegasValues[30:32]
         size = ar36a.shape[-1]
@@ -570,8 +623,6 @@ def calc_ar40ar39(r, sr, smp):
             ratio = np.array([r, sr])
         else:
             raise ValueError(f"Initial ratio is unsupported.")
-        # print(f"{ratio = }")
-        # print(f"{ar36a = }")
         ar40a = calc.arr.mul(ar36a, ratio)
         ar40r = calc.arr.sub(ar40, ar40k, ar40a)
         ar40rar39k: list = calc.arr.div(ar40r, ar39k)
@@ -581,20 +632,20 @@ def calc_ar40ar39(r, sr, smp):
         return ar40rar39k
 
 
-def get_plateau_results(sample: Sample, sequence: list, ar40rar39k: list = None,
+def get_plateau_results(smp: Sample, sequence: list, ar40rar39k: list = None,
                         ar39k_percentage: list = None, **kwargs):
     """
     Get initial ratio re-corrected plateau results
     Parameters
     ----------
-    sample : sample instance
+    smp : sample instance
     sequence : data slice index
     ar40rar39k :
     ar39k_percentage : Ar39K released
 
     Returns
     -------
-    three itmes tuple, result dict, age, and plot data, results keys = [
+    three items tuple, result dict, age, and plot data, results keys = [
         'F', 'sF', 'Num', 'MSWD', 'Chisq', 'Pvalue',
         'age', 's1', 's2', 's3', 'Ar39', 'rs'
     ]
@@ -611,31 +662,40 @@ def get_plateau_results(sample: Sample, sequence: list, ar40rar39k: list = None,
     if len(sequence) == 0:
         return plateau_res, [], []
     if ar40rar39k is None:
-        ar40rar39k = sample.ApparentAgeValues[0:2]
+        ar40rar39k = smp.ApparentAgeValues[0:2]
     if ar39k_percentage is None:
-        ar39k_percentage = sample.ApparentAgeValues[7]
+        ar39k_percentage = smp.ApparentAgeValues[7]
+
+    if str(smp.Info.sample.type).lower() == "unknown":
+        handle = basic.calc_age
+    elif str(smp.Info.sample.type).lower() == "standard":
+        handle = basic.calc_j
+    elif str(smp.Info.sample.type).lower() == "air":
+        handle = basic.calc_mdf
+    else:
+        raise TypeError(f"Sample type is not supported: {smp.Info.sample.type}")
 
-    age = basic.calc_age(ar40ar39=ar40rar39k, smp=sample)[0:2]
+    age = handle(ar40ar39=ar40rar39k, smp=smp)[0:2]
     plot_data = calc.spectra.get_data(*age, ar39k_percentage, indices=sequence, **kwargs)
     f_values = _get_partial(sequence, *ar40rar39k)
     age = _get_partial(sequence, *age)
     sum_ar39k = sum(_get_partial(sequence, ar39k_percentage)[0])
     wmf = calc.arr.wtd_mean(*f_values)
-    wmage = basic.calc_age(wmf[0:2], smp=sample)
+    wmage = handle(wmf[0:2], smp=smp)
 
-    plateau_res.update(dict(zip(
-        plateau_res_keys, [*wmf, *wmage, sum_ar39k, np.nan]
-    )))
+    plateau_res.update(dict(zip(plateau_res_keys, [*wmf, *wmage, sum_ar39k, np.nan])))
     return plateau_res, age, plot_data
 
 
-def get_wma_results(sample: Sample, sequence: list):
+def get_wma_results(sample: Sample, sequence: list, ar40rar39k: list = None, ar39k_percentage: list = None):
     """
     Get initial ratio re-corrected plateau results
     Parameters
     ----------
     sample : sample instance
     sequence : data slice index
+    ar40rar39k :
+    ar39k_percentage :
 
     Returns
     -------
@@ -644,6 +704,11 @@ def get_wma_results(sample: Sample, sequence: list):
         'age', 's1', 's2', 's3', 'Ar39', 'rs'
     ]
     """
+    if ar40rar39k is None:
+        ar40rar39k = sample.ApparentAgeValues[0:2]
+    if ar39k_percentage is None:
+        ar39k_percentage = sample.ApparentAgeValues[7]
+
     spectra_res = initial.SPECTRA_RES.copy()
     # spectra_res = initial.SPECTRA_RES
 
@@ -651,9 +716,9 @@ def get_wma_results(sample: Sample, sequence: list):
         return [arg[min(points): max(points) + 1] for arg in args]
 
     if len(sequence) > 0:
-        sum_ar39k = sum(_get_partial(sequence, sample.ApparentAgeValues[7])[0])
-        fs = _get_partial(sequence, sample.ApparentAgeValues[0])[0]
-        sfs = _get_partial(sequence, sample.ApparentAgeValues[1])[0]
+        sum_ar39k = sum(_get_partial(sequence, ar39k_percentage)[0])
+        fs = _get_partial(sequence, ar40rar39k[0])[0]
+        sfs = _get_partial(sequence, ar40rar39k[1])[0]
 
         wmf, swmf, num, mswd, chisq, p = calc.arr.wtd_mean(fs, sfs)
         age, s1, s2, s3 = basic.calc_age([wmf, swmf], smp=sample)
@@ -667,13 +732,11 @@ def get_wma_results(sample: Sample, sequence: list):
 
 def recalc_j_plateaus(sample: Sample, **kwargs):
 
-    print(f"Recalc J plateau")
-
+    ar40rar39k = sample.ApparentAgeValues[0:2]
     j = sample.ApparentAgeValues[2:4]
 
     try:
-        set1_res, _, set1_data = \
-            get_j_plateau_results(sample, sample.SelectedSequence1, j)
+        set1_res, _, set1_data = get_plateau_results(sample, sample.SelectedSequence1, ar40rar39k=ar40rar39k)
     except ValueError:
         pass
     else:
@@ -682,8 +745,7 @@ def recalc_j_plateaus(sample: Sample, **kwargs):
         sample.AgeSpectraPlot.text1.text = ""  # 注意和js的配合，js那边根据text是否为空判断是否重新生成文字
 
     try:
-        set2_res, _, set2_data = \
-            get_j_plateau_results(sample, sample.SelectedSequence2, j)
+        set2_res, _, set2_data = get_plateau_results(sample, sample.SelectedSequence2, ar40rar39k=ar40rar39k)
     except ValueError:
         pass
     else:
@@ -692,31 +754,6 @@ def recalc_j_plateaus(sample: Sample, **kwargs):
         sample.AgeSpectraPlot.text2.text = ""  # 注意和js的配合，js那边根据text是否为空判断是否重新生成文字
 
 
-def get_j_plateau_results(sample: Sample, sequence: list, j: list, ar39k_percentage: list = None):
-
-    def _get_partial(points, *args):
-        # return [arg[min(points): max(points) + 1] for arg in args]
-        return [[arg[i] for i in points] for arg in args]
-
-    if ar39k_percentage is None:
-        ar39k_percentage = sample.ApparentAgeValues[7]
-    sum_ar39k = sum(_get_partial(sequence, ar39k_percentage)[0])
-
-    j_values = _get_partial(sequence, *j)
-    wmj = calc.arr.wtd_mean(*j_values)
-    plot_data = [[sum(ar39k_percentage[:min(sequence)]), sum(ar39k_percentage[:max(sequence) + 1])],
-                 [wmj[0], wmj[0]]]
-
-    plateau_res_keys = [
-        'F', 'sF', 'Num', 'MSWD', 'Chisq', 'Pvalue', 'age', 's1', 's2', 's3', 'Ar39',
-        'rs',  # 'rs' means relative error of the total sum
-    ]
-    plateau_res = dict(zip(plateau_res_keys, [np.nan for i in plateau_res_keys]))
-    plateau_res.update(dict(zip(plateau_res_keys, [*wmj, np.nan, np.nan, np.nan, np.nan, sum_ar39k, np.nan])))
-
-    return plateau_res, 0, plot_data
-
-
 # =======================
 # Age Distribution Plot
 # =======================