ararpy 0.1.198__tar.gz → 0.1.199__tar.gz

{ararpy-0.1.198 → ararpy-0.1.199}/PKG-INFO

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

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/__init__.py

@@ -16,7 +16,7 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.1.198'
+version = '0.1.199'
 __version__ = version
 full_version = version
 last_update = '2024-03-28'

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/calc/arr.py

@@ -67,10 +67,11 @@ def div(a, b):
     n = np.shape([a, b])[-1]
     k0, k1 = [], []
     for i in range(n):
-        k0.append(np.divide(a[0][i], b[0][i]))
-        k1.append(
-            (np.divide(a[1][i] ** 2, b[0][i] ** 2) +
-             np.divide(a[0][i] ** 2 * b[1][i] ** 2, b[0][i] ** 4)) ** .5)
+        try:
+            k0.append(np.divide(a[0][i], b[0][i]))
+            k1.append((np.divide(a[1][i] ** 2, b[0][i] ** 2) + np.divide(a[0][i] ** 2 * b[1][i] ** 2, b[0][i] ** 4)) ** .5)
+        except TypeError as e:
+            raise TypeError(f"a = {a[0][i]}, b = {b[0][i]},  {e}")
     return [k0, k1]
 
 

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/calc/corr.py

@@ -72,18 +72,18 @@ def mdf(rm: float, srm: float, m1: float, m2: float, ra: float = 298.56,
             v3 = err.div((np.log(ra / rm), v1), (np.log(ratio_m), v2))
             k4 = err.div((np.log(ra / rm) / np.log(ratio_m), v3), (m1, sm1))
         except Exception:
-            k3, k4 = "Null", "Null"
+            k3, k4 = 0, 0
         # pow
         try:
             k5 = pow((ra / rm), (1 / delta_m))  # Renne2009, B.D. Turrin2010
             k6 = err.pow((ra / rm, err.div((ra, sra), (rm, srm))),
                          (1 / delta_m, err.div((1, 0), (delta_m, sdelta_m))))
         except Exception:
-            k5, k6 = "Null", "Null"
-        return k1, k2, k3, k4, k5, k6
+            k5, k6 = 0, 0
+        return k1, k2, k2, k2, k3, k4, k4, k4, k5, k6, k6, k6
     else:
         mdf_line_2 = (rm / ra - 1) / delta_m  # Ryu et al., 2013
-        return mdf_line_2, 0, 0, 0, 0, 0
+        return mdf_line_2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 
 
 def discr(a0: list, e0: list, mdf: list, smdf: list, m: list, m40: list,

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/calc/jvalue.py

@@ -36,4 +36,4 @@ def j_value(age, sage, r, sr, f, rsf):
     v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2
     v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2
     k1 = np.sqrt(v1 + v2 + v3)
-    return k0, k1
+    return k0, k1, k1, k1

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/calc/plot.py

@@ -39,8 +39,11 @@ def get_axis_scale(data: list, count=6, increment=None, extra_count=0, min_inter
     """
     if len(data) == 0:
         return 0, 1, 5, 0.2  # Default return
-    _max = float(np.ma.masked_invalid(data).max())
-    _min = float(np.ma.masked_invalid(data).min())
+    _max = np.ma.masked_invalid(data).max()
+    _min = np.ma.masked_invalid(data).min()
+    if isinstance(_max, np.ma.core.MaskedConstant) or isinstance(_min, np.ma.core.MaskedConstant):
+        return 0, 1, 5, 0.2  # Default return
+    _max = float(_max); _min = float(_min)
     interval = (_max - _min) / count
     if interval == 0:
         interval = 10

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/smp/basic.py

@@ -59,24 +59,81 @@ def calc_apparent_ages(smp: Sample):
 
 
 def calc_j(ar40ar39=None, params: dict = None, smp: Sample = None, index: list = None):
-    std_age, std_err = smp.TotalParam[59:61]
-    r, sr = smp.ApparentAgeValues[0:2]  # ar40ar39, error
-    f, rsf = smp.TotalParam[34:36]  # L, sL
-    j, sj = calc.jvalue.j_value(std_age, std_err, r, sr, f, rsf)
-    return [j.tolist(), sj.tolist()]
+    params_index_dict = {
+        34: 'L', 35: 'rsL', 59: 'Age', 60: 'sAge'
+    }
+    if ar40ar39 is None and smp is not None:
+        ar40ar39 = smp.ApparentAgeValues[0:2]  # ar40ar39 air, error
+    if len(np.shape(ar40ar39)) == 1:
+        ar40ar39 = np.reshape(ar40ar39, (2, 1))
+    if index is None:
+        index = list(range(np.shape(ar40ar39)[-1]))
+    if smp is None and params is None:
+        raise ValueError(f"Parameters are required for calculating mdf, or it is empty.")
+    if params is not None:
+        for key, val in params.items():
+            if not isinstance(val, list):
+                params[key] = list(val)
+    if smp is not None:
+        try:
+            params_from_smp = dict(zip(
+                list(params_index_dict.values()),
+                [[smp.TotalParam[i][j] for j in index] for i in params_index_dict.keys()]
+            ))
+        except Exception:
+            print(traceback.format_exc())
+            raise ValueError(f"Parameters cannot be found in the given sample object")
+        if params is not None:
+            params_from_smp.update(params)
+        params = params_from_smp
+
+    j = calc.jvalue.j_value(params['Age'], params['sAge'], *ar40ar39, params['L'], params['rsL'])
+
+    if len(index) == 1:
+        return np.array(j).squeeze().tolist()
+    else:
+        return np.array(j).tolist()
 
 
 def calc_mdf(ar40ar36=None, params: dict = None, smp: Sample = None, index: list = None):
-    std_air, std_err = smp.TotalParam[93:95]
-    m36, sm36 = smp.TotalParam[71:73]
-    m40, sm40 = smp.TotalParam[79:81]
-    air, sair = smp.ApparentAgeValues[0:2]  # ar40ar36 air, error
-    discrimination_method = smp.TotalParam[100]  # L, sL
+    params_index_dict = {
+        71: 'M36', 72: 'sM36', 79: 'M40', 80: 'sM40', 93: 'Air', 94: 'sAir', 100: 'Discr'
+    }
+    if ar40ar36 is None and smp is not None:
+        ar40ar36 = smp.ApparentAgeValues[0:2]  # ar40ar36 air, error
+    if len(np.shape(ar40ar36)) == 1:
+        ar40ar36 = np.reshape(ar40ar36, (2, 1))
+    if index is None:
+        index = list(range(np.shape(ar40ar36)[-1]))
+    if smp is None and params is None:
+        raise ValueError(f"Parameters are required for calculating mdf, or it is empty.")
+    if params is not None:
+        for key, val in params.items():
+            if not isinstance(val, list):
+                params[key] = list(val)
+    if smp is not None:
+        try:
+            params_from_smp = dict(zip(
+                list(params_index_dict.values()),
+                [[smp.TotalParam[i][j] for j in index] for i in params_index_dict.keys()]
+            ))
+        except Exception:
+            print(traceback.format_exc())
+            raise ValueError(f"Parameters cannot be found in the given sample object")
+        if params is not None:
+            params_from_smp.update(params)
+        params = params_from_smp
+
     mdf = []
-    for i in range(len(std_air)):
-        k = calc.corr.mdf(air[i], sair[i], m36[i], m40[i], std_air[i], std_err[i])  # linear, exp, pow
-        mdf.append({"linear": k[0:2], "exp": k[2:4], "pow": k[4:6]}[discrimination_method[i].lower()])
-    return np.transpose(mdf).tolist()
+    for i in range(len(index)):
+        k = calc.corr.mdf(ar40ar36[0][i], ar40ar36[1][i], params['M36'][i], params['M40'][i],
+                          params['Air'][i], params['sAir'][i])  # linear, exp, pow
+        mdf.append({"linear": k[0:4], "exp": k[4:8], "pow": k[8:12]}[params['Discr'][i].lower()])
+
+    if len(index) == 1:
+        return np.transpose(mdf).squeeze().tolist()
+    else:
+        return np.transpose(mdf).tolist()
 
 
 def calc_age(ar40ar39=None, params: dict = None, smp: Sample = None, index: list = None):

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/smp/corr.py

@@ -25,16 +25,15 @@ from .sample import Sample
 def corr_gain(sample: Sample):
     """Blank Correction"""
     corrGain = True
-    gain_corrected = np.zeros([10, len(sample.SequenceName)])
+    gain_corrected = np.zeros([10, sample.Info.experiment.step_num])
     try:
         for i in range(5):
             f, sf = np.array(sample.TotalParam[126 + i * 2:128 + i * 2])
             sf = f * sf / 100
             gain_corrected[i * 2:2 + i * 2] = calc.corr.gain(*sample.SampleIntercept[i * 2:2 + i * 2], f, sf)
-    except Exception as e:
-        print(f"Gain correction failed")
-        print(traceback.format_exc())
-        return
+    except (Exception, BaseException) as e:
+        print(f"Gain correction failed: \n{traceback.format_exc()}")
+        raise
     for i in range(0, 10, 2):
         gain_corrected[i] = [gain_corrected[i][index] if corrGain else j for index, j in enumerate(sample.SampleIntercept[i])]
         gain_corrected[i + 1] = [gain_corrected[i + 1][index] if corrGain else j for index, j in enumerate(sample.SampleIntercept[i + 1])]

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/smp/initial.py

@@ -237,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.
@@ -261,13 +261,22 @@ 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 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(smp, std)

{ararpy-0.1.198 → ararpy-0.1.199}/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,64 @@ 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(
+    print(f"{total_f = }")
+    print(f"{total_age = }")
+    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())
 
@@ -390,7 +403,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):
@@ -437,7 +450,7 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
     try:
         set1_res, set1_age, set1_data = get_plateau_results(
             sample, sample.SelectedSequence1, calc_ar40ar39(*ratio_set1, smp=sample),
-            ar39k_percentage=np.cumsum(ar39k) / np.sum(ar39k),
+            ar39k_percentage=np.array(ar39k) / np.sum(ar39k),
             **kwargs)
     except ValueError:
         # print(traceback.format_exc())
@@ -450,7 +463,7 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
     try:
         set2_res, set2_age, set2_data = get_plateau_results(
             sample, sample.SelectedSequence2, calc_ar40ar39(*ratio_set2, smp=sample),
-            ar39k_percentage=np.cumsum(ar39k) / np.sum(ar39k),
+            ar39k_percentage=np.array(ar39k) / np.sum(ar39k),
             **kwargs)
     except ValueError:
         # print(traceback.format_exc())
@@ -464,7 +477,7 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
     # Weighted mean ages of two sets with 298.56 (defoult air ratio)
     try:
         set1_res = get_wma_results(
-            sample, sample.SelectedSequence1, ar40rar39k=ar40rar39k, ar39k_percentage=np.cumsum(ar39k) / np.sum(ar39k))
+            sample, sample.SelectedSequence1, ar40rar39k=ar40rar39k, ar39k_percentage=np.array(ar39k) / np.sum(ar39k))
     except ValueError:
         pass
         # raise ValueError(f"Set 1 WMA calculation error.")
@@ -472,7 +485,7 @@ def recalc_age_plateaus(sample: Sample, **kwargs):
         sample.Info.results.age_spectra.update({0: set1_res})
     try:
         set2_res = get_wma_results(
-            sample, sample.SelectedSequence2, ar40rar39k=ar40rar39k, ar39k_percentage=np.cumsum(ar39k) / np.sum(ar39k))
+            sample, sample.SelectedSequence2, ar40rar39k=ar40rar39k, ar39k_percentage=np.array(ar39k) / np.sum(ar39k))
     except ValueError:
         pass
         # raise ValueError(f"Set 2 WMA calculation error.")
@@ -552,6 +565,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.
@@ -586,20 +634,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'
     ]
@@ -616,21 +664,28 @@ 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
 
 
@@ -679,13 +734,11 @@ def get_wma_results(sample: Sample, sequence: list, ar40rar39k: list = None, ar3
 
 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:
@@ -694,8 +747,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:
@@ -704,31 +756,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
 # =======================

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/smp/sample.py

@@ -54,7 +54,21 @@ PUBLISH_TABLE_HEADERS = [
     'Sequence', '',  # 0-1
     '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
     '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
-    'Apparent Age', '1\u03C3', '\u2074\u2070Arr%', '\u00B3\u2079ArK%',  # 7-10
+    'Apparent Age', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%',  # 7-10
+    'Ca/K', '1\u03C3',  # 11-12
+]
+PUBLISH_TABLE_HEADERS_AIR = [
+    'Sequence', '',  # 0-1
+    '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
+    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
+    'MDF', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 7-10
+    'Ca/K', '1\u03C3',  # 11-12
+]
+PUBLISH_TABLE_HEADERS_STD = [
+    'Sequence', '',  # 0-1
+    '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
+    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
+    'J', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 7-10
     'Ca/K', '1\u03C3',  # 11-12
 ]
 SPECTRUM_TABLE_HEADERS = [
@@ -63,6 +77,18 @@ SPECTRUM_TABLE_HEADERS = [
     'Apparent Age', '1\u03C3', '1\u03C3', '1\u03C3',  # 4-7
     '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%',  # 8-9
 ]
+SPECTRUM_TABLE_HEADERS_AIR = [
+    'Sequence', '',  # 0-1
+    '\u2074\u2070Ar/\u00B3\u2076Ar', '1\u03C3',  # 2-3
+    'MDF', '1\u03C3', '1\u03C3', '1\u03C3',  # 4-7
+    '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 8-9
+]
+SPECTRUM_TABLE_HEADERS_STD = [
+    'Sequence', '',  # 0-1
+    '\u2074\u2070Ar/\u00B3\u2076Ar', '1\u03C3',  # 2-3
+    'J', '1\u03C3', '1\u03C3', '1\u03C3',  # 4-7
+    '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 8-9
+]
 ISOCHRON_TABLE_HEADERS = [
     'Sequence', '', 'Mark',  # 0-2
     '\u00B3\u2079Ar[K]/\u00B3\u2076Ar[a]', '1\u03C3',  # 3-4
@@ -259,19 +285,26 @@ TOTAL_PARAMS_SHORT_HEADERS = [
     '40Gain', '%1s',  # 136-137
 ]
 
-DEFAULT_PLOT_STYLES = {
+DEFAULT_PLOT_STYLES = lambda sample_type, age_unit: {
     'figure_1': {
-        'id': 'figure_1', 'name': 'Age Spectra', 'type': 'spectra', 'attr_name': 'AgeSpectraPlot',
+        'id': 'figure_1', 'name': 'Age Spectra' if sample_type == "Unknown" else 'J Spectra' if sample_type == "Standard" else "MDF" if sample_type == "Air" else "Unkown Title",
+        'type': 'spectra', 'attr_name': 'AgeSpectraPlot',
         'rightside_text': [],
-        'title': {'id': 'title', 'show': True, 'text': 'Age Spectra', 'position': 'center',
+        'title': {'id': 'title', 'show': True,
+                  'text': 'Age Spectra' if sample_type == "Unknown" else 'J Spectra' if sample_type == "Standard" else "MDF" if sample_type == "Air" else "Unkown Title",
+                  'position': 'center',
                   'font_size': 18, 'color': '#333333', 'opacity': 1, 'type': 'text', 'font_weight': 'bolder',
                   'font_family': 'Microsoft Sans Serif', },
         'xaxis': {
-            'title': {'text': 'Cumulative {sup|39}Ar Released (%)', 'type': 'text', }, 'type': 'axis',
+            'title': {'text': 'Cumulative {sup|39}Ar Released (%)' if sample_type == "Unknown" or sample_type == "Standard" else "Cumulative {sup|36}Ar Released (%)" if sample_type == "Air" else "Unkown Title",
+                      'type': 'text', }, 'type': 'axis',
             'min': 0, 'max': 100, 'show_splitline': False, 'ticks_inside': False, 'split_number': 5, 'interval': 10,
         },
         'yaxis': {
-            'title': {'text': 'Apparent Age (Ma)', 'type': 'text', }, 'type': 'axis',
+            'title': {
+                'text': f'Apparent Age ({age_unit})' if sample_type == "Unknown" else 'J Values' if sample_type == "Standard" else "MDF" if sample_type == "Air" else "Unkown Title",
+                'type': 'text',
+            }, 'type': 'axis',
             'min': 0, 'max': 100, 'show_splitline': False, 'ticks_inside': False, 'split_number': 5, 'interval': 10,
         },
         'set1': {'id': 'Points Set 1', 'type': 'set', },

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy/smp/style.py

@@ -19,13 +19,26 @@ Sample = samples.Sample
 Table = samples.Table
 Plot = samples.Plot
 
-TABLEHEADER = lambda index: [
-    '',
-    samples.SAMPLE_INTERCEPT_HEADERS, samples.BLANK_INTERCEPT_HEADERS,
-    samples.CORRECTED_HEADERS, samples.DEGAS_HEADERS, samples.PUBLISH_TABLE_HEADERS,
-    samples.SPECTRUM_TABLE_HEADERS, samples.ISOCHRON_TABLE_HEADERS,
-    samples.TOTAL_PARAMS_HEADERS
-][index]
+TABLEHEADER = lambda index, sample_type: {
+    'Unknown': ['',
+                samples.SAMPLE_INTERCEPT_HEADERS, samples.BLANK_INTERCEPT_HEADERS,
+                samples.CORRECTED_HEADERS, samples.DEGAS_HEADERS, samples.PUBLISH_TABLE_HEADERS,
+                samples.SPECTRUM_TABLE_HEADERS, samples.ISOCHRON_TABLE_HEADERS,
+                samples.TOTAL_PARAMS_HEADERS
+                ],
+    'Standard': ['',
+                samples.SAMPLE_INTERCEPT_HEADERS, samples.BLANK_INTERCEPT_HEADERS,
+                samples.CORRECTED_HEADERS, samples.DEGAS_HEADERS, samples.PUBLISH_TABLE_HEADERS_STD,
+                samples.SPECTRUM_TABLE_HEADERS_STD, samples.ISOCHRON_TABLE_HEADERS,
+                samples.TOTAL_PARAMS_HEADERS
+                ],
+    'Air': ['',
+            samples.SAMPLE_INTERCEPT_HEADERS, samples.BLANK_INTERCEPT_HEADERS,
+            samples.CORRECTED_HEADERS, samples.DEGAS_HEADERS, samples.PUBLISH_TABLE_HEADERS_AIR,
+            samples.SPECTRUM_TABLE_HEADERS_AIR, samples.ISOCHRON_TABLE_HEADERS,
+            samples.TOTAL_PARAMS_HEADERS
+            ],
+}[sample_type][index]
 
 
 # =======================
@@ -58,13 +71,6 @@ def set_plot_style(smp: Sample):
                 setattr(figure, 'title', Plot.Text())
             setattr(getattr(figure, 'title'), 'text', f"{suffix} {getattr(figure, 'name', '')}")
 
-    age_unit = "Undefined"
-    try:
-        age_unit = str(smp.Info.preference['ageUnit']).capitalize()
-    except:
-        print(traceback.format_exc())
-    smp.AgeSpectraPlot.yaxis.title.text = f"Apparent Age ({age_unit})"
-
 
 def reset_plot_scale(smp: Sample, only_figure: str = None):
     """
@@ -160,7 +166,8 @@ def reset_text(smp: Sample, only_figure: str = None):
     -------
     None
     """
-    for figure_id in list(samples.DEFAULT_PLOT_STYLES.keys()):
+    default_styles = initial.get_default_plot_style(smp)
+    for figure_id in list(default_styles.keys()):
         if only_figure is not None and figure_id != only_figure:
             continue
         figure = basic.get_component_byid(smp, figure_id)
@@ -190,7 +197,7 @@ def set_table_style(sample: Sample):
     """
     for key, comp in basic.get_components(sample).items():
         if isinstance(comp, Table):
-            comp.header = TABLEHEADER(index=int(comp.id))
+            comp.header = TABLEHEADER(sample_type=sample.Info.sample.type, index=int(comp.id))
             comp.set_coltypes()
             # comp.colcount = len(comp.header)
             # comp.coltypes = [{'type': 'numeric'}] * (comp.colcount)

{ararpy-0.1.198 → ararpy-0.1.199}/ararpy.egg-info/PKG-INFO

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

{ararpy-0.1.198 → ararpy-0.1.199}/setup.py

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