ararpy 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.2.2'
+version = '0.2.4'
 __version__ = version
 full_version = version
-last_update = '2026-01-01'
+last_update = '2026-01-07'
 
 """ ArArPy Functions """
 
@@ -97,24 +97,6 @@ Sample.set_params = smp.basic.set_params
 Sample.set_info = lambda _smp, info: setattr(_smp, 'Info', smp.basic.update_plot_from_dict(_smp.Info, info))
 
 Sample.recalculate = lambda _smp, *args, **kwargs: smp.calculation.recalculate(_smp, *args, **kwargs)
-Sample.plot_init = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=False, isInit=True, isPlateau=False)
-Sample.plot_isochron = lambda _smp, **kwargs: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, **kwargs)
-Sample.plot_age_plateau = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=False, isInit=False, isPlateau=True)
-Sample.plot_normal = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, figures=['figure_2'])
-Sample.plot_inverse = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, figures=['figure_3'])
-Sample.plot_cl_1 = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, figures=['figure_4'])
-Sample.plot_cl_2 = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, figures=['figure_5'])
-Sample.plot_cl_3 = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, figures=['figure_6'])
-Sample.plot_3D = lambda _smp: smp.calculation.recalculate(
-    _smp, re_plot=True, isIsochron=True, isInit=False, isPlateau=False, figures=['figure_7'])
 
 Sample.to_excel = lambda _smp, file_path, *args, **kwargs: smp.export.to_excel(_smp, file_path=file_path, *args, **kwargs)
 

ararpy/calc/arr.py

@@ -311,7 +311,10 @@ def multi_append(a, *args):
 
     """
     for arg in args:
-        a.append(arg)
+        if isinstance(a, list):
+            a.append(arg)
+        if isinstance(a, np.ndarray):
+            a = np.append(a, arg)
     return a
 
 
@@ -351,7 +354,7 @@ def create_arr(shape: tuple):
 
     """
     if len(shape) == 1:
-        return []
+        return [0 for i in range(shape[0])]
     return [create_arr(shape[1:]) for i in range(shape[0])]
 
 

ararpy/calc/corr.py

@@ -272,6 +272,7 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
                   G40: Tuple[float, float], G39: Tuple[float, float], G38: Tuple[float, float],
                   G37: Tuple[float, float], G36: Tuple[float, float],
                   stand_time_year: float, JNFactor: Tuple[float, float],
+                  KCaFactor: Tuple[float, float], KClFactor: Tuple[float, float],
                   **options):
     """
 
@@ -359,6 +360,9 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
     R38v39k = random_normal_relative(*R38v39k, size=Monte_Carlo_Size)
     R36v38clp = random_normal_relative(*R36v38clp, size=Monte_Carlo_Size)
 
+    KCa = random_normal_relative(*KCaFactor, size=Monte_Carlo_Size)
+    KCl = random_normal_relative(*KClFactor, size=Monte_Carlo_Size)
+
     JNFactor = random_normal_absolute(*JNFactor, size=Monte_Carlo_Size)
 
     def do_simulation():
@@ -380,31 +384,23 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
             _ar39 = (ar39m[i] / G39[i] - ar39b[i] / (G39[i] if blank_gain_corr else 1)) * P39Mdf * P39Decay
             _ar40 = (ar40m[i] / G40[i] - ar40b[i] / (G40[i] if blank_gain_corr else 1)) * P40Mdf
 
+            _ar37ca = _ar37
+
             if force_to_zero:
-                _ar36 = max(_ar36, 0)
-                _ar37 = max(_ar37, 0)
-                _ar38 = max(_ar38, 0)
-                _ar39 = max(_ar39, 0)
-                _ar40 = max(_ar40, 0)
+                _ar37ca = max(_ar37, 0)
 
-            _ar37ca = _ar37
             _ar39ca = _ar37ca * R39v37ca[i]
             _ar38ca = _ar37ca * R38v37ca[i]
             _ar36ca = _ar37ca * R36v37ca[i]
 
+            _ar39k = _ar39 - _ar39ca
+
             if force_to_zero:
-                _ar39ca = min(_ar39ca, _ar39)
-                _ar38ca = min(_ar38ca, _ar38)
-                _ar36ca = min(_ar36ca, _ar36)
+                _ar39k = max(_ar39k, 0)
 
-            _ar39k = _ar39 - _ar39ca
             _ar38k = _ar39k * R38v39k[i]
             _ar40k = _ar39k * R40v39k[i]
 
-            if force_to_zero:
-                _ar38k = min(_ar38k, _ar38 - _ar38ca)
-                _ar40k = min(_ar40k, _ar40)
-
             _ar38res = _ar38 - _ar38k - _ar38ca
             _ar36res = _ar36 - _ar36ca
 
@@ -433,6 +429,8 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
 
             factor = JNFactor[i]
 
+            _CaK = _ar37ca / _ar39k / KCa[i]
+
             i += 1
 
             yield _ar36a, 0, _ar36ca, _ar36cl, _ar37ca, _ar38cl, _ar38a, 0, _ar38k, _ar38ca, _ar39k, _ar39ca, _ar40r, _ar40a, 0, _ar40k, \
@@ -442,7 +440,7 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
                   (_ar39k * factor) / _ar40r, _ar38cl / _ar40r, \
                   _ar38cl / (_ar39k * factor), _ar40r / (_ar39k * factor), \
                   _ar36res / _ar40ar, _ar38res / _ar40ar, (_ar39k * factor) / _ar40ar, \
-                  _ar36, _ar37, _ar38, _ar39, _ar40
+                  _ar36, _ar37, _ar38, _ar39, _ar40, _CaK
 
     data = np.array(list(do_simulation()))
     means = data.mean(axis=0)
@@ -467,8 +465,9 @@ def Monte_Carlo_F(ar40m: Tuple[float, float], ar39m: Tuple[float, float], ar38m:
     corrected_data = np.column_stack((means[29:34], stds[29:34])).ravel()
 
     F = np.append(means[25], stds[25])
+    CaK = np.append(means[34], stds[34])
 
-    return *F, *degas_data, *nor_iso, *inv_iso, *cl1_iso, *cl2_iso, *cl3_iso, *threed_iso, *corrected_data
+    return *F, *degas_data, *nor_iso, *inv_iso, *cl1_iso, *cl2_iso, *cl3_iso, *threed_iso, *corrected_data, *CaK
 
     # print("F = {0} ± {1}".format(np.mean(F), np.std(F)))
     #

ararpy/files/calc_file.py

@@ -81,7 +81,7 @@ def open_252(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
         162, 163, 164, 165, 166, 167, 168, 169,  # 40 r, a, c, k    26-33
     ]
     publish_values_index = [
-        101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+        188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
     ]
     apparent_age_values_index = [
         198, 199, 200, 201, -999, -999, 202, 203,  # f, sf, ages, s, s, s, 40Arr%, 39Ar%
@@ -244,7 +244,9 @@ def open_240(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
         148, -999, 149, -999, 150, -999, 151, -999,
     ]
     publish_values_index = [
-        99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1,
+        -1, -1, -1, -1,
     ]
     apparent_age_values_index = [
         # f, sf, ages, s, s, s, 39Ar%

ararpy/smp/basic.py

@@ -35,15 +35,16 @@ pd.options.mode.chained_assignment = None  # default='warn'
 # =======================
 class ParamsInvalid(Exception):
     """    """
-    def __init__(self, code, message, context=None):
+    def __init__(self, code=400, message="", context=None, fatal=True):
         self.code = code
         self.message = message
         self.context = context or {}
+        self.fatal = fatal
         # 调用父类构造函数，确保异常能正常抛出
         super().__init__(f"{self.message}")
 
 
-def validate_params(**kwargs):
+def validate_params(fatal=True, **kwargs):
 
     def check(data, dtype, **kwargs):
         k = np.array(data, dtype=dtype)
@@ -65,7 +66,7 @@ def validate_params(**kwargs):
                     if not kwargs.get('func')(each):
                         raise ValueError
                 except (Exception, BaseException) as e:
-                    raise ValueError(f"{type(e).__name__}: invalid value, {each}")
+                    raise ValueError(f"invalid value, {each}")
 
     context = {'names': [], 'classnames': [], 'messages': []}
     for index, (name, content) in enumerate(kwargs.items(), 1):
@@ -83,7 +84,7 @@ def validate_params(**kwargs):
     if not context['names']:
         return True
     else:
-        raise ParamsInvalid(400, '. '.join(context['messages']), context)
+        raise ParamsInvalid(400, '. '.join(context['messages']), context, fatal=fatal)
 
 
 # =======================
@@ -119,7 +120,7 @@ def calc_apparent_ages(smp: Sample):
         raise TypeError(f"Sample type is not supported: {smp.Info.sample.type}")
 
     smp.ApparentAgeValues[2:6] = v[0:4]
-    smp.PublishValues[5:7] = copy.deepcopy(v[0:2])
+    smp.PublishValues[12:14] = copy.deepcopy(v[0:2])
 
 
 def calc_j(ar40ar39=None, params: dict = None, smp: Sample = None, index: list = None):
@@ -268,7 +269,7 @@ def calc_age(ar40ar39=None, params: dict = None, smp: Sample = None, index: list
             age_unit_factor = 1
 
     # check if using Min equation
-    params['Min'] = [i if isinstance(i, bool) else False for i in params['Min']]
+    params['Min'] = [bool(i) for i in params['Min']]
 
     idx1 = np.flatnonzero(np.where(params['Min'], True, False))  # True, using Min equation
     idx2 = np.flatnonzero(np.where(params['Min'], False, True))  # False
@@ -591,7 +592,7 @@ def get_diff_smp(backup: (dict, Sample), smp: (dict, Sample)):
             if _res != {}:
                 res.update({name: _res})
             continue
-        if str(backup[name]) == str(attr) or backup[name] == attr:
+        if str(backup[name]) == str(attr):
             continue
         res.update({name: attr})
     return res
@@ -668,6 +669,10 @@ def set_params(smp: Sample, params: Union[List, str], flag: Optional[str] = None
         else:
             smp.TotalParam[32] = [item / (3600 * 24 * 365.242) if index in rows else smp.TotalParam[32][index] for index, item in enumerate(stand_time_second)]  # stand year
 
+        smp.Info.irradiation.label = params[-3]
+        smp.Info.irradiation.location = params[-2]
+        smp.Info.irradiation.info = params[-1]
+
     elif flag == 'smp':
         smp.TotalParam[67:71] = remove_none(smp.TotalParam[67:71], params[0:4], rows, n)
         smp.TotalParam[58:67] = remove_none(smp.TotalParam[58:67], params[4:13], rows, n)
@@ -702,6 +707,7 @@ def get_sequence(smp: Sample):
     smp.Info.results.selection[0]['data'] = smp.SelectedSequence1
     smp.Info.results.selection[1]['data'] = smp.SelectedSequence2
     smp.Info.results.selection[2]['data'] = smp.UnselectedSequence
+    smp.Info.experiment.step_num = len(smp.SequenceName)
     return ArArBasic(
         size=len(smp.SequenceName), name=smp.SequenceName, value=smp.SequenceValue, unit=smp.SequenceUnit,
         mark=ArArBasic(

ararpy/smp/corr.py

@@ -55,7 +55,6 @@ def corr_blank(sample: Sample):
     for i in range(0, 10, 2):
         blank_corrected[i] = [blank_corrected[i][index] if sample.TotalParam[102][index] else j for index, j in enumerate(sample.SampleIntercept[i])]
         blank_corrected[i + 1] = [blank_corrected[i + 1][index] if sample.TotalParam[102][index] else j for index, j in enumerate(sample.SampleIntercept[i + 1])]
-        blank_corrected[i] = [0 if j < 0 and sample.TotalParam[101][index] else j for index, j in enumerate(blank_corrected[i])]
     sample.BlankCorrected = blank_corrected
 
 
@@ -147,9 +146,6 @@ def corr_decay(sample: Sample):
             *sample.MassDiscrCorrected[2:4], t1, t2, t3, *sample.TotalParam[44:46], isRelative=True)
         decay_corrected[6:8] = calc.corr.decay(
             *sample.MassDiscrCorrected[6:8], t1, t2, t3, *sample.TotalParam[42:44], isRelative=True)
-        # Negative number set to zero in decay correction
-        decay_corrected[2] = [0 if i < 0 else i for i in decay_corrected[2]]
-        decay_corrected[6] = [0 if i < 0 else i for i in decay_corrected[6]]
     except Exception as e:
         print(traceback.format_exc())
         raise ValueError(f'Decay correction error: {str(e)}')
@@ -157,10 +153,17 @@ def corr_decay(sample: Sample):
     corrDecay37 = sample.TotalParam[104]
     corrDecay39 = sample.TotalParam[105]
     sample.CorrectedValues = copy.deepcopy(sample.MassDiscrCorrected)
-    sample.CorrectedValues[2] = [val if corrDecay37[idx] else 0 for idx, val in enumerate(decay_corrected[2])]
-    sample.CorrectedValues[3] = [val if corrDecay37[idx] else 0 for idx, val in enumerate(decay_corrected[3])]
-    sample.CorrectedValues[6] = [val if corrDecay39[idx] else 0 for idx, val in enumerate(decay_corrected[6])]
-    sample.CorrectedValues[7] = [val if corrDecay39[idx] else 0 for idx, val in enumerate(decay_corrected[7])]
+    for idx in range(sample.Info.experiment.step_num):
+        if corrDecay37[idx]:
+            sample.CorrectedValues[2][idx] = decay_corrected[2][idx]
+            sample.CorrectedValues[3][idx] = decay_corrected[3][idx]
+        if corrDecay39[idx]:
+            sample.CorrectedValues[6][idx] = decay_corrected[6][idx]
+            sample.CorrectedValues[7][idx] = decay_corrected[7][idx]
+
+    data = np.array(sample.CorrectedValues)
+    data[1:10:2] = data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+    sample.PublishValues[0:10] = copy.deepcopy(data.tolist())
 
 
 # =======================
@@ -189,8 +192,10 @@ def calc_degas_ca(sample: Sample):
     if not validate_params(**params_to_check):
         return
 
+    set_negative_zero = sample.TotalParam[101]
     corrDegasCa = sample.TotalParam[106]
-    ar37ca = sample.CorrectedValues[2:4]
+    ar37ca = copy.deepcopy(sample.CorrectedValues[2:4])
+    ar37ca[0] = [0 if val < 0 and set_negative_zero[i] else val for i, val in enumerate(ar37ca[0])]
     ar39ca = calc.arr.mul_factor(ar37ca, sample.TotalParam[8:10], isRelative=True)
     ar38ca = calc.arr.mul_factor(ar37ca, sample.TotalParam[10:12], isRelative=True)
     ar36ca = calc.arr.mul_factor(ar37ca, sample.TotalParam[12:14], isRelative=True)
@@ -201,7 +206,6 @@ def calc_degas_ca(sample: Sample):
     sample.DegasValues[19] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar38ca[1])]
     sample.DegasValues[22] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar39ca[0])]  # 39Ca
     sample.DegasValues[23] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar39ca[1])]
-    sample.PublishValues[1] = copy.deepcopy(sample.DegasValues[8])
 
 
 # =======================
@@ -242,7 +246,6 @@ def calc_degas_k(sample: Sample):
     sample.DegasValues[17] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar38k[1])]
     sample.DegasValues[30] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar40k[0])]
     sample.DegasValues[31] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar40k[1])]
-    sample.PublishValues[3] = copy.deepcopy(sample.DegasValues[20])
 
 
 # =======================
@@ -351,7 +354,6 @@ def calc_degas_cl(sample: Sample):
 
     sample.DegasValues[6:8] = copy.deepcopy(ar36cl)
     sample.DegasValues[10:12] = copy.deepcopy(ar38cl)
-    sample.PublishValues[2] = copy.deepcopy(sample.DegasValues[10])
 
 
 # =======================
@@ -408,7 +410,6 @@ def calc_degas_atm(sample: Sample):
     sample.DegasValues[13] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar38a[1])]
     sample.DegasValues[26] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar40a[0])]  # Ar40a
     sample.DegasValues[27] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar40a[1])]
-    sample.PublishValues[0] = copy.deepcopy(sample.DegasValues[ 0])
 
 
 # =======================
@@ -439,7 +440,6 @@ def calc_degas_r(sample: Sample):
     ar40r = calc.arr.sub(ar40ar, sample.DegasValues[26:28])
     ar40r[0] = [0 if item < 0 and sample.TotalParam[101][index] else item for index, item in enumerate(ar40r[0])]
     sample.DegasValues[24:26] = copy.deepcopy(ar40r)
-    sample.PublishValues[4] = copy.deepcopy(sample.DegasValues[24])
 
 
 def calc_degas_c(sample: Sample):
@@ -588,7 +588,8 @@ def calc_ratio(sample: Sample):
         calc.arr.rec_factor(sample.TotalParam[20:22], isRelative=True))
 
     sample.ApparentAgeValues[6] = ar40r_percent
-    sample.PublishValues[7:11] = copy.deepcopy([*sample.ApparentAgeValues[6:8], *CaK])
+    sample.PublishValues[10:12] = copy.deepcopy(sample.ApparentAgeValues[0:2])
+    sample.PublishValues[14:18] = copy.deepcopy([*sample.ApparentAgeValues[6:8], *CaK])
 
     sample.IsochronValues[0:5], sample.IsochronValues[6:11] = calc_nor_inv_isochrons(sample)
     sample.IsochronValues[12:17], sample.IsochronValues[18:23], sample.IsochronValues[24:29] = \
@@ -629,13 +630,11 @@ def calc_ratio_monte_carlo(sample: Sample):
         # corrected
         sample.CorrectedValues = res[2 + 32 + 39:2 + 32 + 39 + 10]
         # publish
-        sample.PublishValues[0] = copy.deepcopy(sample.DegasValues[ 0])
-        sample.PublishValues[1] = copy.deepcopy(sample.DegasValues[ 8])
-        sample.PublishValues[2] = copy.deepcopy(sample.DegasValues[10])
-        sample.PublishValues[3] = copy.deepcopy(sample.DegasValues[20])
-        sample.PublishValues[4] = copy.deepcopy(sample.DegasValues[24])
-        sample.PublishValues[5:7] = copy.deepcopy(sample.ApparentAgeValues[2:4])
-        sample.PublishValues[7:9] = copy.deepcopy(sample.ApparentAgeValues[6:8])
+        data = np.array(sample.CorrectedValues)
+        data[1:10:2] = data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+        sample.PublishValues[0:10] = copy.deepcopy(data.tolist())
+        sample.PublishValues[10:14] = copy.deepcopy(sample.ApparentAgeValues[0:4])
+        sample.PublishValues[14:16] = copy.deepcopy(sample.ApparentAgeValues[6:8])
 
 
 def monte_carlo_f(sample: Sample):
@@ -731,6 +730,10 @@ def monte_carlo_f(sample: Sample):
     R38v36a = np.transpose(sample.TotalParam[4:6])
     R36v38clp = np.transpose(sample.TotalParam[56:58])
 
+    R36v38cl = np.transpose(sample.TotalParam[18:20])  # ?
+    KCaFactor = np.transpose(sample.TotalParam[20:22])
+    KClFactor = np.transpose(sample.TotalParam[22:24])
+
     stand_time_year = np.transpose(sample.TotalParam[32])
     JNFactor = np.transpose(sample.TotalParam[136:138])
 
@@ -764,10 +767,12 @@ def monte_carlo_f(sample: Sample):
             L37ar=L37ar[i], L39ar=L39ar[i], L36cl=L36cl[i],
             MDF=MDF[i], stand_time_year=stand_time_year[i],
             JNFactor=JNFactor[i],
+            KCaFactor=KCaFactor[i],
+            KClFactor=KClFactor[i],
             blank_gain_corr=sample.TotalParam[111][i],
             MDF_method=sample.TotalParam[100][i],
             force_to_zero=sample.TotalParam[101][i],
-            monte_carlo_size=1000,
+            monte_carlo_size=4000,
         )
 
         yield res

ararpy/smp/export.py

@@ -1219,7 +1219,7 @@ class WritingWorkbook:
             [(4, 11, 1), list(map(lambda x: 2*x, self.sample.ApparentAgeValues[3])), {'num_format': '± ' + self.default_fmt_prop['num_format']}],
             [(4, 12, 1), self.sample.ApparentAgeValues[6], {}],
             [(4, 13, 1), self.sample.ApparentAgeValues[7], {}],
-            [(4, 14, 1), self.sample.PublishValues[9], {}],
+            [(4, 14, 1), self.sample.PublishValues[16], {}],
             [(4 + num_step, 0, 0), [''] * 15, {'bold': 1, 'top': 1}],
 
             [(5 + num_step, 0), "Table 2. 40Ar/39Ar age summary", {'bold': 1, 'align': 'left'}],

ararpy/smp/initial.py

@@ -128,6 +128,8 @@ def initial(smp: Sample):
     smp.BlankIntercept = arr.create_arr((len(samples.BLANK_INTERCEPT_HEADERS) - 3, 0))
     smp.SampleIntercept = arr.create_arr((len(samples.SAMPLE_INTERCEPT_HEADERS) - 3, 0))
     smp.PublishValues = arr.create_arr((len(samples.PUBLISH_TABLE_HEADERS) - 3, 0))
+    smp.BlankCorrected = arr.create_arr((10, 0))
+    smp.MassDiscrCorrected = arr.create_arr((10, 0))
     smp.DecayCorrected = arr.create_arr((10, 0))
     smp.CorrectedValues = arr.create_arr((len(samples.CORRECTED_HEADERS) - 3, 0))
     smp.DegasValues = arr.create_arr((len(samples.DEGAS_HEADERS) - 3, 0))
@@ -189,7 +191,7 @@ def initial(smp: Sample):
         ),
         preference=ArArBasic(**PREFERENCE_RES),
         irradiation= ArArBasic(
-            label='', pos_h='', pos_x='', pos_y='',
+            label='', pos_h='', pos_x='', pos_y='', location='', info=''
         )
     ))
 
@@ -232,7 +234,7 @@ def initial(smp: Sample):
     ))
     setattr(smp, 'TotalParamsTable', Table(
         id='8', name='Total Params', header=samples.TOTAL_PARAMS_HEADERS, decimal_places=decimal_places,
-        text_indexes=[0, 1, 2, 30, 31, 33, 34, 61, 100, 103, *list(range(104, 118))],
+        text_indexes=[0, 1, 2, 29, 30, 31, 33, 34, 61, 100, 103, 118],
         # numeric_indexes=list(range(1, 120)),
     ))
 
@@ -357,10 +359,25 @@ def check_version(smp: Sample):
             smp.TotalParam[32] = [np.nan for index in range(smp.Info.experiment.step_num)]
         else:
             smp.TotalParam[32] = [item / (3600 * 24 * 365.242) for item in stand_time_second]  # stand year
-        smp = smp.recalculate(re_table_style=True)
-        smp = smp.recalculate(re_set_table=True)
         smp.version = "20251001"
 
+    # 20251231 change publish table
+    if version < 20251231:
+        smp.PublishValues = arr.create_arr((len(samples.PUBLISH_TABLE_HEADERS) - 3, smp.Info.experiment.step_num))
+        try:
+            data = np.array(smp.CorrectedValues)
+            data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+            smp.PublishValues[0:10] = copy.deepcopy(data.tolist())
+            smp.PublishValues[10:14] = copy.deepcopy(smp.ApparentAgeValues[0:4])
+            smp.PublishValues[14:16] = copy.deepcopy(smp.ApparentAgeValues[6:8])
+        except (BaseException, Exception) as e:
+            print(f"{type(e).__name__}: {str(e)}")
+            pass
+        else:
+            smp = smp.recalculate(re_table_style=True)
+            smp = smp.recalculate(re_set_table=True)
+            smp.version = "20251231"
+
     return smp