ararpy 0.1.199__py3-none-any.whl → 0.2.1__py3-none-any.whl

ararpy/smp/corr.py

@@ -17,56 +17,46 @@ import re
 
 from .. import calc
 from .sample import Sample
+from . basic import validate_params
 
 
 # =======================
-# Corr Gain
+# Corr Blank
 # =======================
-def corr_gain(sample: Sample):
+def corr_blank(sample: Sample):
     """Blank Correction"""
-    corrGain = True
-    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, BaseException) as e:
-        print(f"Gain correction failed: \n{traceback.format_exc()}")
+        params_to_check = {
+            'unknown intercepts': {'data': sample.SampleIntercept[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            'blank intercepts': {'data': sample.BlankIntercept[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            'gain factors': {'data': sample.TotalParam[126:136], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+        }
+    except (IndexError, AttributeError) as e:
         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])]
-    sample.CorrectedValues = copy.deepcopy(gain_corrected)
-
+    if not validate_params(**params_to_check):
+        return
 
-# =======================
-# Corr Blank
-# =======================
-def corr_blank(sample: Sample):
-    """Blank Correction"""
-    blank_corrected = np.zeros([10, len(sample.SequenceName)])
+    blank_corrected = np.zeros([10, sample.Info.experiment.step_num])
     try:
         for i in range(5):
-            b, sb = copy.deepcopy(sample.BlankIntercept[i * 2: i * 2 + 2])
-            f, sf = np.array(sample.TotalParam[126 + i * 2:128 + i * 2])
-            sf = f * sf / 100
-            _ = calc.corr.gain(*sample.BlankIntercept[i * 2:2 + i * 2], f, sf)
-            for index in range(len(sample.BlankIntercept[i * 2])):
-                if sample.TotalParam[111][index]:  # use same parameters to correct blank intercepts
-                    b[index] = _[0][index]
-                    sb[index] = _[1][index]
-            blank_corrected[i * 2:2 + i * 2] = calc.corr.blank(
-                *sample.CorrectedValues[i * 2:2 + i * 2], b, sb)
+            b, sb = np.array(sample.BlankIntercept[i * 2: i * 2 + 2])
+            u, su = np.array(sample.SampleIntercept[i * 2: i * 2 + 2])
+            f, sf = np.array(sample.TotalParam[126 + i * 2: 128 + i * 2])  # gain factors
+            sf = f * sf / 100  # to absolute errors
+            u, su = np.array(calc.corr.gain(u, su, f, sf))  # unknown intercepts gain corrected
+            _b, _sb = np.array(calc.corr.gain(b, sb, f, sf))  # balnk intercepts gain corrected
+            apply_gain_to_blank = np.array(sample.TotalParam[111], dtype=bool)
+            b[~apply_gain_to_blank] = _b[~apply_gain_to_blank]
+            sb[~apply_gain_to_blank] = _sb[~apply_gain_to_blank]
+            blank_corrected[i * 2:2 + i * 2] = calc.corr.blank(u, su, b, sb)
     except Exception as e:
         print(traceback.format_exc())
-        raise ValueError('Blank correction error')
+        raise ValueError(f'Blank correction error: {str(e)}')
     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.CorrectedValues[i])]
-        blank_corrected[i + 1] = [blank_corrected[i + 1][index] if sample.TotalParam[102][index] else j for index, j in enumerate(sample.CorrectedValues[i + 1])]
+        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
-    sample.CorrectedValues = copy.deepcopy(sample.BlankCorrected)
 
 
 # =======================
@@ -74,13 +64,29 @@ def corr_blank(sample: Sample):
 # =======================
 def corr_massdiscr(sample: Sample):
     """Mass Discrimination Correction"""
+    try:
+        params_to_check = {
+            'blank corrected': {'data': sample.BlankCorrected[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            'masses': [
+                {'data': sample.TotalParam[71:81:2], 'dtype': float, 'func': lambda x: x > 0, 'class': 'k2', },
+                {'data': sample.TotalParam[72:81:2], 'dtype': float, 'class': 'k2', },
+            ],
+            'MDF values': {'data': sample.TotalParam[69:71], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+            'mass discrimination correction method': {
+                'data': sample.TotalParam[100], 'dtype': str, 'func': lambda x: str(x).lower()[0] in ['l', 'e', 'p'], 'class': 'k4',
+            },
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
     corrMassdiscr = sample.TotalParam[103][0]
     if not corrMassdiscr:
         sample.MassDiscrCorrected = copy.deepcopy(sample.BlankCorrected)
-        sample.CorrectedValues = copy.deepcopy(sample.MassDiscrCorrected)
         return
     MASS = sample.TotalParam[71:81]
-    mdf_corrected = np.zeros([10, len(sample.SequenceName)])
+    mdf_corrected = np.zeros([10, sample.Info.experiment.step_num])
     try:
         for i in range(5):
             if len(sample.BlankCorrected[i * 2:2 + i * 2]) == 0:
@@ -88,12 +94,11 @@ def corr_massdiscr(sample: Sample):
             mdf_corrected[i * 2:2 + i * 2] = calc.corr.discr(
                 *sample.BlankCorrected[i * 2:2 + i * 2],
                 *sample.TotalParam[69:71], m=MASS[i * 2], m40=MASS[8], isRelative=True,
-                method=sample.TotalParam[100][0])
+                method=sample.TotalParam[100])
     except Exception as e:
         print(traceback.format_exc())
-        raise ValueError(f'Mass discrimination correction error: {e}')
-    sample.MassDiscrCorrected = mdf_corrected
-    sample.CorrectedValues = copy.deepcopy(sample.MassDiscrCorrected)
+        raise ValueError(f'Mass discrimination correction error: {str(e)}')
+    sample.MassDiscrCorrected = copy.deepcopy(mdf_corrected)
 
 
 # =======================
@@ -109,14 +114,35 @@ def corr_decay(sample: Sample):
     -------
 
     """
-    decay_corrected = np.zeros([10, len(sample.SequenceName)])
+    try:
+        params_to_check = {
+            'Ar37': {'data': sample.MassDiscrCorrected[2:4], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            'λAr37': {'data': sample.TotalParam[44:46], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            'Ar39': {'data': sample.MassDiscrCorrected[6:8], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+            'λAr39': {'data': sample.TotalParam[42:44], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k4', },
+            'irradiation cycles': [
+                {'data': sample.TotalParam[27], 'dtype': str, 'func': lambda x: all(
+                    [len(re.findall(r"\d+", item)) >= 5 for item in list(filter(None, re.split(r'[DS]', x)))[::2]]), 'class': 'k5', },
+                {'data': sample.TotalParam[27], 'dtype': str, 'func': lambda x: all(
+                    [isinstance(float(item), float) for item in list(filter(None, re.split(r'[DS]', x)))[1::2]]), 'class': 'k5', },
+            ],
+            'experiment datetime': {'data': sample.TotalParam[31], 'dtype': str, 'func': lambda x: len(re.findall(r"\d+", x)) >= 5, 'class': 'k6', },
+            # 'apply Ar37 decay': {'data': sample.TotalParam[104], 'dtype': bool},
+            # 'apply Ar39 decay': {'data': sample.TotalParam[105], 'dtype': bool},
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
+    decay_corrected = np.zeros([10, sample.Info.experiment.step_num])
     try:
         irradiation_cycles = [list(filter(None, re.split(r'[DS]', each_step))) for each_step in sample.TotalParam[27]]
-        t1 = [re.findall(r"\d+", i) for i in sample.TotalParam[31]]  # t1: experimental times
-        t2, t3 = [], []  # t2: irradiation times, t3: irradiation durations
+        t1 = [re.findall(r"\d+", i) for i in sample.TotalParam[31]]  # t1: experiment time
+        t2, t3 = [], []  # t2: irradiation time, t3: irradiation duration
         for each_step in irradiation_cycles:
-            t2.append([re.findall(r"\d+", item) for i, item in enumerate(each_step) if i % 2 == 0])
-            t3.append([item for i, item in enumerate(each_step) if i % 2 == 1])
+            t2.append([re.findall(r"\d+", item) for item in each_step[::2]])
+            t3.append([item for item in each_step[1::2]])
         decay_corrected[2:4] = calc.corr.decay(
             *sample.MassDiscrCorrected[2:4], t1, t2, t3, *sample.TotalParam[44:46], isRelative=True)
         decay_corrected[6:8] = calc.corr.decay(
@@ -126,10 +152,11 @@ def corr_decay(sample: Sample):
         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('Decay correction correction error')
+        raise ValueError(f'Decay correction error: {str(e)}')
 
     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])]
@@ -149,20 +176,32 @@ def calc_degas_ca(sample: Sample):
     -------
 
     """
-    corrDecasCa = sample.TotalParam[106]
-    # n = len(sample.CorrectedValues[2])
+    try:
+        params_to_check = {
+            'Ar37Ca': {'data': sample.TotalParam[106], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            '36/37Ca': {'data': sample.TotalParam[12:14], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            '38/37Ca': {'data': sample.TotalParam[10:12], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+            '39/37Ca': {'data': sample.TotalParam[8:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k4', },
+            # 'apply Ca degas': {'data': sample.TotalParam[106], 'dtype': bool},
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
+    corrDegasCa = sample.TotalParam[106]
     ar37ca = sample.CorrectedValues[2:4]
     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)
     sample.DegasValues[8:10] = copy.deepcopy(ar37ca)  # 37Ca
-    sample.DegasValues[ 4] = [val if corrDecasCa[idx] else 0 for idx, val in enumerate(ar36ca[0])]  # 36Ca
-    sample.DegasValues[ 5] = [val if corrDecasCa[idx] else 0 for idx, val in enumerate(ar36ca[1])]
-    sample.DegasValues[18] = [val if corrDecasCa[idx] else 0 for idx, val in enumerate(ar38ca[0])]  # 38Ca
-    sample.DegasValues[19] = [val if corrDecasCa[idx] else 0 for idx, val in enumerate(ar38ca[1])]
-    sample.DegasValues[22] = [val if corrDecasCa[idx] else 0 for idx, val in enumerate(ar39ca[0])]  # 39Ca
-    sample.DegasValues[23] = [val if corrDecasCa[idx] else 0 for idx, val in enumerate(ar39ca[1])]
-    sample.PublishValues[1] = copy.deepcopy(ar37ca[0])
+    sample.DegasValues[ 4] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar36ca[0])]  # 36Ca
+    sample.DegasValues[ 5] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar36ca[1])]
+    sample.DegasValues[18] = [val if corrDegasCa[idx] else 0 for idx, val in enumerate(ar38ca[0])]  # 38Ca
+    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])
 
 
 # =======================
@@ -178,22 +217,32 @@ def calc_degas_k(sample: Sample):
     -------
 
     """
+    try:
+        params_to_check = {
+            'Ar39': {'data': sample.CorrectedValues[6:8], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            'Ar39Ca': {'data': sample.DegasValues[22:24], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            '38/39K': {'data': sample.TotalParam[16:18], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+            '40/39K': {'data': sample.TotalParam[14:16], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k4', },
+            # 'apply K degas': {'data': sample.TotalParam[107], 'dtype': bool},
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
     corrDecasK = sample.TotalParam[107]
     set_negative_zero = sample.TotalParam[101]
-    # n = len(sample.CorrectedValues[6])
     ar39k = calc.arr.sub(sample.CorrectedValues[6:8], sample.DegasValues[22:24])
     ar39k[0] = [0 if val < 0 and set_negative_zero[idx] else val for idx, val in enumerate(ar39k[0])]
     ar40k = calc.arr.mul_factor(ar39k, sample.TotalParam[14:16], isRelative=True)
     ar38k = calc.arr.mul_factor(ar39k, sample.TotalParam[16:18], isRelative=True)
 
-    sample.PublishValues[3] = copy.deepcopy(ar39k[0])
     sample.DegasValues[20:22] = copy.deepcopy(ar39k)
-    # sample.DegasValues[30:32] = ar40k if corrDecasK else [[0] * n, [0] * n]
-    # sample.DegasValues[16:18] = ar38k if corrDecasK else [[0] * n, [0] * n]
     sample.DegasValues[16] = [val if corrDecasK[idx] else 0 for idx, val in enumerate(ar38k[0])]
     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])
 
 
 # =======================
@@ -209,6 +258,28 @@ def calc_degas_cl(sample: Sample):
     -------
 
     """
+    try:
+        params_to_check = {
+            'Ar36': [
+                {'data': sample.CorrectedValues[0:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+                {'data': sample.CorrectedValues[4:6], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+                {'data': sample.DegasValues[4:6], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            ],
+            'Ar38': [
+                {'data': sample.DegasValues[16:18], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+                {'data': sample.DegasValues[18:20], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            ],
+            '38/36t': {'data': sample.TotalParam[4:6], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+            '36/38Cl productivity': {'data': sample.TotalParam[56:58], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k4', },
+            'λCl36': {'data': sample.TotalParam[46:48], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k5', },
+            'standing time': {'data': sample.TotalParam[32], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k6', },
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
+    n = sample.Info.experiment.step_num
     corrDecasCl = sample.TotalParam[108]
     decay_const = sample.TotalParam[46:48]
     cl36_cl38_p = sample.TotalParam[56:58]
@@ -220,8 +291,7 @@ def calc_degas_cl(sample: Sample):
                       range(len(decay_const[0]))]  # convert to absolute error
     cl36_cl38_p[1] = [cl36_cl38_p[0][i] * cl36_cl38_p[1][i] / 100 for i in
                       range(len(cl36_cl38_p[0]))]  # convert to absolute error
-    # convert to absolute error
-    ar38ar36[1] = [ar38ar36[0][i] * ar38ar36[1][i] / 100 for i in range(len(ar38ar36[0]))]
+    ar38ar36[1] = [ar38ar36[0][i] * ar38ar36[1][i] / 100 for i in range(len(ar38ar36[0]))] # convert to absolute error
     # ============
     # 36Ar deduct Ca, that is sum of 36Ara and 36ArCl
     ar36acl = calc.arr.sub(sample.CorrectedValues[0:2], sample.DegasValues[4:6])
@@ -234,28 +304,29 @@ def calc_degas_cl(sample: Sample):
                 ar36acl[0][index] = 0
             if ar38acl[0][index] < 0:
                 ar38acl[0][index] = 0
-    try:
-        if not corrDecasCl:
-            raise ValueError("Do not apply degas chlorine")
-        vDecay = [cl36_cl38_p[0][i] * (1 - np.exp(-1 * decay_const[0][i] * stand_time_year[i])) for i in
-              range(len(stand_time_year))]
-        sDecay = [pow((cl36_cl38_p[1][i] * (1 - np.exp(-1 * decay_const[0][i] * stand_time_year[i]))) ** 2 +
-                  (cl36_cl38_p[0][i] * stand_time_year[i] * (np.exp(-1 * decay_const[0][i] * stand_time_year[i])) *
-                   decay_const[1][i]) ** 2, 0.5) for i in range(len(stand_time_year))]
-        sDecay = [calc.err.div((1, 0), (vDecay[i], sDecay[i])) for i in range(len(sDecay))]
-        vDecay = [1 / vDecay[i] for i in range(len(vDecay))]
-
-        # 36ArCl
-        ar36cl = [[], []]
-        # 38ArCl
-        ar38cl = [[], []]
-        for i in range(len(vDecay)):
+    # 36ArCl
+    ar36cl = [[], []]
+    # 38ArCl
+    ar38cl = [[], []]
+    for i in range(n):
+
+        if not corrDecasCl[i]:
+            v1 = s1 = v2 = s2 = 0
+        else:
+            vDecay = cl36_cl38_p[0][i] * (1 - np.exp(-1 * decay_const[0][i] * stand_time_year[i]))
+            sDecay = pow(
+                (cl36_cl38_p[1][i] * (1 - np.exp(-1 * decay_const[0][i] * stand_time_year[i]))) ** 2 +
+                (cl36_cl38_p[0][i] * stand_time_year[i] * (np.exp(-1 * decay_const[0][i] * stand_time_year[i])) *
+                 decay_const[1][i]) ** 2, 0.5)
+            sDecay = calc.err.div((1, 0), (vDecay, sDecay))
+            vDecay = 1 / vDecay
+
             a1 = sample.CorrectedValues[0][i]; s1 = sample.CorrectedValues[1][i]
             a2 = sample.DegasValues[4][i]; s2 = sample.DegasValues[5][i];
             a3 =  sample.DegasValues[16][i]; s3 = sample.DegasValues[17][i]
             a4 =  sample.DegasValues[18][i]; s4 = sample.DegasValues[19][i]
             a5 =  sample.CorrectedValues[4][i]; s5 = sample.CorrectedValues[5][i]
-            a6 = vDecay[i]; s6 = sDecay[i]
+            a6 = vDecay; s6 = sDecay
             a7 = ar38ar36[0][i]; s7 = ar38ar36[1][i]
 
             d1 = 1 / (1 - a6 / a7)
@@ -266,30 +337,21 @@ def calc_degas_cl(sample: Sample):
             d6 = (a1 - a2 + (a3 + a4) / a7 - a5 / a7) / a7 / (1 - a6 / a7) ** 2
             d7 = -(a1 - a2) * (a6) / (a7 - a6) ** 2 - (a3 + a4 - a5) / (a7 - a6) ** 2
 
-            v1 = (a1 - a2 + (a3 + a4) / a7 - a5 / a7) / (1 - a6 / a7)
+            v1 = (a1 - a2 + (a3 + a4 - a5) / a7) / (1 - a6 / a7)
             s1 = (d1**2*s1**2 + d2**2*s2**2 + d3**2*s3**2 + d4**2*s4**2+ d5**2*s5**2 + d6**2*s6**2 + d7**2*s7**2) ** .5
-            s2 = calc.err.mul((v1, s1), (vDecay[i], sDecay[i]))
+            s2 = calc.err.mul((v1, s1), (a6, s6))
             v1 = 0 if (ar36acl[0][i] - v1 < 0 or v1 < 0) and set_negative_zero[i] else v1
-            v2 = v1 * vDecay[i]
-
-            # Note: Ar36Cl uncertainty is differen with ArArCALC. All calculation was conducted separately considering they are independent
-            # s1 = calc.err.div((a1 - a2 + (a3 + a4) / a7 - a5 / a7, calc.err.add(s1, s2, calc.err.div((a3 + a4, calc.err.add(s3, s4)), (a7, s7)), calc.err.div((a5, s5), (a7, s7)))), (1 - a6 / a7, calc.err.div((a6, s6), (a7, s7))))
+            v2 = v1 * a6
 
-            ar36cl[0].append(v1); ar36cl[1].append(s1)
-            ar38cl[0].append(v2); ar38cl[1].append(s2)
+        # Note: Ar36Cl uncertainty is differen with ArArCALC. All calculation was conducted separately considering they are independent
+        # s1 = calc.err.div((a1 - a2 + (a3 + a4) / a7 - a5 / a7, calc.err.add(s1, s2, calc.err.div((a3 + a4, calc.err.add(s3, s4)), (a7, s7)), calc.err.div((a5, s5), (a7, s7)))), (1 - a6 / a7, calc.err.div((a6, s6), (a7, s7))))
 
-    except Exception as e:
-        print('Error in corr Cl: {}, lines: {}'.format(e, e.__traceback__.tb_lineno))
-        ar36cl = np.zeros([2, len(ar36acl[0])])
-        ar38cl = np.zeros([2, len(ar36acl[0])])
+        ar36cl[0].append(v1); ar36cl[1].append(s1)
+        ar38cl[0].append(v2); ar38cl[1].append(s2)
 
-    # sample.DegasValues[6:8] = ar36cl
-    # sample.DegasValues[10:12] = ar38cl
-    sample.PublishValues[2] = copy.deepcopy(ar38cl[0])
-    sample.DegasValues[ 6] = [val if corrDecasCl[idx] else 0 for idx, val in enumerate(ar36cl[0])]
-    sample.DegasValues[ 7] = [val if corrDecasCl[idx] else 0 for idx, val in enumerate(ar36cl[1])]
-    sample.DegasValues[10] = [val if corrDecasCl[idx] else 0 for idx, val in enumerate(ar38cl[0])]
-    sample.DegasValues[11] = [val if corrDecasCl[idx] else 0 for idx, val in enumerate(ar38cl[1])]
+    sample.DegasValues[6:8] = copy.deepcopy(ar36cl)
+    sample.DegasValues[10:12] = copy.deepcopy(ar38cl)
+    sample.PublishValues[2] = copy.deepcopy(sample.DegasValues[10])
 
 
 # =======================
@@ -305,37 +367,48 @@ def calc_degas_atm(sample: Sample):
     -------
 
     """
+    try:
+        params_to_check = {
+            'Ar36': [
+                {'data': sample.CorrectedValues[0:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+                {'data': sample.DegasValues[4:6], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+                {'data': sample.DegasValues[6:8], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            ],
+            '38/36t': {'data': sample.TotalParam[4:6], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            '40/36t': {'data': sample.TotalParam[0:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+            # 'apply atm degas': {'data': sample.TotalParam[109], 'dtype': bool},
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
     corrDecasAtm = sample.TotalParam[109]
     set_negative_zero = sample.TotalParam[101]
-    # n = len(sample.CorrectedValues[0])
     # 36Ar deduct Ca, that is sum of 36Ara and 36ArCl
     ar36acl = calc.arr.sub(sample.CorrectedValues[0:2], sample.DegasValues[4:6])
     ar36acl[0] = [0 if val < 0 and set_negative_zero[idx] else val for idx, val in enumerate(ar36acl[0])]
-    # 38Ar deduct K and Ca, that is sum of 38Ara and 38ArCl
-    # ar38acl = calc.arr.sub()(
-    #     calc.arr.sub()(sample.CorrectedValues[2:4], sample.DegasValues[16:18]), sample.DegasValues[18:20])
     # 36ArAir
     ar36a = calc.arr.sub(ar36acl, sample.DegasValues[6:8])
     # If ar36acl - ar36cl < 0, let ar36a = ar36 - ar36ca
     ar36a[0] = [ar36acl[index] if item < 0 and set_negative_zero[index] else item for index, item in enumerate(ar36a[0])]
     if sample.Info.sample.type == "Air":
+        # Air shot: no chlorine related Ar38
         ar38a = copy.deepcopy(sample.CorrectedValues[4:6])
         ar40a = copy.deepcopy(sample.CorrectedValues[8:10])
     else:
-        # 38ArAir
+        # 38ArAir, Ar36a × factor
         ar38a = calc.arr.mul_factor(ar36a, sample.TotalParam[4:6], isRelative=True)
-        # 40ArAir
+        # 40ArAir, Ar36a × factor
         ar40a = calc.arr.mul_factor(ar36a, sample.TotalParam[0:2], isRelative=True)
 
-    sample.PublishValues[0] = copy.deepcopy(ar36a[0])
-    # sample.DegasValues[12:14] = ar38a if corrDecasAtm else [[0] * n, [0] * n]
-    # sample.DegasValues[26:28] = ar40a if corrDecasAtm else [[0] * n, [0] * n]
-    sample.DegasValues[ 0] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar36a[0])]
+    sample.DegasValues[ 0] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar36a[0])]  # Ar36a
     sample.DegasValues[ 1] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar36a[1])]
-    sample.DegasValues[12] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar38a[0])]
+    sample.DegasValues[12] = [val if corrDecasAtm[idx] else 0 for idx, val in enumerate(ar38a[0])]  # Ar38a
     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])]
+    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])
 
 
 # =======================
@@ -351,57 +424,87 @@ def calc_degas_r(sample: Sample):
     -------
 
     """
+    try:
+        params_to_check = {
+            'Ar40': {'data': sample.CorrectedValues[8:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+            'Ar40K': {'data': sample.DegasValues[30:32], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            'Ar40a': {'data': sample.DegasValues[26:28], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
     ar40ar = calc.arr.sub(sample.CorrectedValues[8:10], sample.DegasValues[30:32])
     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(ar40r[0])
+    sample.PublishValues[4] = copy.deepcopy(sample.DegasValues[24])
+
+
+def calc_degas_c(sample: Sample):
+    """ Degas for residuals
+    Parameters
+    ----------
+    sample
+
+    Returns
+    -------
+
+    """
+    n = sample.Info.experiment.step_num
+    sample.DegasValues[ 2] = [0 for i in range(n)]  # 36Arc
+    sample.DegasValues[ 3] = [0 for i in range(n)]
+    sample.DegasValues[14] = [0 for i in range(n)]  # 38Arc
+    sample.DegasValues[15] = [0 for i in range(n)]
+    sample.DegasValues[28] = [0 for i in range(n)]  # 40Arc
+    sample.DegasValues[29] = [0 for i in range(n)]
 
 
 # =======================
 # Calc ratio
 # =======================
 def calc_nor_inv_isochrons(sample: Sample):
-    n = len(sample.SequenceName)
+    n = sample.Info.experiment.step_num
     try:
         isochron_1 = calc.isochron.get_data(
-            *calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor),
+            *calc.arr.mul(sample.DegasValues[20:22], sample.TotalParam[136:138]),
             *calc.arr.sub(sample.CorrectedValues[8:10], sample.DegasValues[30:32]),
             *sample.DegasValues[0:2]
         )
         isochron_2 = calc.isochron.get_data(
-            *calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor),
+            *calc.arr.mul(sample.DegasValues[20:22], sample.TotalParam[136:138]),
             *sample.DegasValues[0:2],
             *calc.arr.sub(sample.CorrectedValues[8:10], sample.DegasValues[30:32]))
     except (BaseException, Exception):
-        return np.zeros([5, n]), np.zeros([5, n])
+        return np.empty([5, n]), np.empty([5, n])
     else:
         return isochron_1, isochron_2
 
 
 def calc_cl_isochrons(sample: Sample):
-    n = len(sample.SequenceName)
+    n = sample.Info.experiment.step_num
     try:
         isochron_3 = calc.isochron.get_data(
-            *calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor),
+            *calc.arr.mul(sample.DegasValues[20:22], sample.TotalParam[136:138]),
             *sample.DegasValues[24:26],
-            *calc.arr.mul(sample.DegasValues[10:12], sample.NormalizeFactor))
+            *calc.arr.mul(sample.DegasValues[10:12], sample.TotalParam[136:138]))
         isochron_4 = calc.isochron.get_data(
-            *calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor),
-            *calc.arr.mul(sample.DegasValues[10:12], sample.NormalizeFactor),
+            *calc.arr.mul(sample.DegasValues[20:22], sample.TotalParam[136:138]),
+            *calc.arr.mul(sample.DegasValues[10:12], sample.TotalParam[136:138]),
             *sample.DegasValues[24:26])
         isochron_5 = calc.isochron.get_data(
-            *calc.arr.mul(sample.DegasValues[10:12], sample.NormalizeFactor),
+            *calc.arr.mul(sample.DegasValues[10:12], sample.TotalParam[136:138]),
             *sample.DegasValues[24:26],
-            *calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor))
+            *calc.arr.mul(sample.DegasValues[20:22], sample.TotalParam[136:138]))
     except (BaseException, Exception):
-        return np.zeros([5, n]), np.zeros([5, n]), np.zeros([5, n])
+        return np.empty([5, n]), np.empty([5, n]), np.empty([5, n])
     else:
         return isochron_3, isochron_4, isochron_5
 
 
 def calc_3D_isochrons(sample: Sample):
-    n = len(sample.SequenceName)
+    n = sample.Info.experiment.step_num
     try:
         # === Ar values ===
         # 3D ratio, 36Ar(a+cl)/40Ar(a+r), 38Ar(a+cl)/40Ar(a+r), 39Ar(k)/40Ar(a+r),
@@ -418,32 +521,50 @@ def calc_3D_isochrons(sample: Sample):
         # isochron_6 = calc.isochron.get_3d_data(*ar36acl, *ar38acl, *ar40ar, *ar39k)
         isochron_6 = calc.isochron.get_3d_data(*ar36acl, *ar38acl, *ar39k, *ar40ar)  # Points on the plot will be more disperse than the above
     except:
-        return np.zeros([9, n])
+        return np.empty([9, n])
     else:
         return isochron_6
 
 
-def calc_ratio(sample: Sample, monte_carlo: bool = False):
+def calc_ratio(sample: Sample):
     """ Calculate isochron ratio data, 40Arr/39ArK, Ar40r percentage,
         Ar39K released percentage, Ca/K
     Parameters
     ----------
     sample : Sample instance
-    monte_carlo : whether conduct monte carlo simulation for calculating 40Arr/39ArK
 
     Returns
     -------
     None
     """
-    ar40r_percent = [item / sample.CorrectedValues[8][index] * 100 if sample.CorrectedValues[8][index] != 0 else 0
-                     for index, item in enumerate(sample.DegasValues[24])]
-    sum_ar36a = sum(sample.DegasValues[ 0])
-    CaK = calc.arr.mul_factor(calc.arr.mul_factor(
-        sample.DegasValues[8:10], calc.arr.rec_factor(sample.DegasValues[20:22], isRelative=False)),
-        calc.arr.rec_factor(sample.TotalParam[20:22], isRelative=True))
+
+    try:
+        if sample.Info.sample.type == "Air":
+            params_to_check = {
+                'corrected values': {'data': sample.CorrectedValues[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+                'degas values': {'data': sample.DegasValues[0:32], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+            }
+        else:
+            params_to_check = {
+                'corrected values': {'data': sample.CorrectedValues[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k1', },
+                'degas values': {'data': sample.DegasValues[0:32], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k2', },
+                'K/Ca factor': {'data': sample.TotalParam[20:22], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k3', },
+                'normalizing factor': [
+                    {'data': sample.TotalParam[136], 'dtype': float, 'func': lambda x: np.isfinite(x) and x > 0, 'class': 'k4', },
+                    {'data': sample.TotalParam[137], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k4', },
+                ],
+                # 'apply monte carlo': {'data': sample.TotalParam[112][0], 'dtype': bool, },
+            }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
+
+    n = sample.Info.experiment.step_num
 
     # assignation
     if sample.Info.sample.type == "Air":
+        sum_ar36a = sum(sample.DegasValues[ 0])
         ar40aar36a = calc.arr.mul_factor(
             sample.DegasValues[26:28], calc.arr.rec_factor(sample.DegasValues[0:2], isRelative=False),
             isRelative=False)
@@ -451,7 +572,7 @@ def calc_ratio(sample: Sample, monte_carlo: bool = False):
         sample.ApparentAgeValues[0:2] = ar40aar36a
         sample.ApparentAgeValues[7] = ar36a_percent
     else:
-        ar39k, sar39k = calc.arr.mul(sample.DegasValues[20:22], sample.NormalizeFactor)
+        ar39k, sar39k = calc.arr.mul(sample.DegasValues[20:22], sample.TotalParam[136:138])
         sum_ar39k = sum(ar39k)
         ar39k_percent = [item / sum_ar39k * 100 if sum_ar39k != 0 else 0 for item in ar39k]
         ar40rar39k = calc.arr.mul_factor(
@@ -460,12 +581,23 @@ def calc_ratio(sample: Sample, monte_carlo: bool = False):
         sample.ApparentAgeValues[0:2] = ar40rar39k
         sample.ApparentAgeValues[7] = ar39k_percent
 
+    ar40r_percent = [item / sample.CorrectedValues[8][index] * 100 if sample.CorrectedValues[8][index] != 0 else 0
+                     for index, item in enumerate(sample.DegasValues[24])]
+    CaK = calc.arr.mul_factor(calc.arr.mul_factor(
+        sample.DegasValues[8:10], calc.arr.rec_factor(sample.DegasValues[20:22], isRelative=False)),
+        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.IsochronValues[0:5], sample.IsochronValues[6:11] = calc_nor_inv_isochrons(sample)
     sample.IsochronValues[12:17], sample.IsochronValues[18:23], sample.IsochronValues[24:29] = \
         calc_cl_isochrons(sample)
+    sample.IsochronValues[5] = [np.nan] * n
+    sample.IsochronValues[11] = [np.nan] * n
+    sample.IsochronValues[17] = [np.nan] * n
+    sample.IsochronValues[23] = [np.nan] * n
+    sample.IsochronValues[29] = [np.nan] * n
 
     # === Cl-Atm-Correlation Plot ===
     sample.IsochronValues[30:39] = calc_3D_isochrons(sample)
@@ -478,18 +610,32 @@ def calc_ratio(sample: Sample, monte_carlo: bool = False):
 
     # Note that the difference between Turner 3D plots and our 3D plots.
 
-    if monte_carlo:
-        res = monte_carlo_f(sample=sample)
-        # where to display simulation results
-        res = calc.arr.transpose(list(res))  # res is a generator for [age, sage, ...]
-        age, sage = res[:2]
-        sample.ApparentAgeValues[1] = sage
 
+def calc_ratio_monte_carlo(sample: Sample):
+    monte_carlo = sample.TotalParam[112][0]
+    if monte_carlo and sample.Info.sample.type != "Air":
+        res = monte_carlo_f(sample=sample)
+        # ages
+        res = np.array(list(res)).T  # res is a generator for [*F, *age, iso, ...]
+        sample.ApparentAgeValues[0:2] = res[0:2]
+        sample.ApparentAgeValues[2] = [np.nan] * sample.Info.experiment.step_num
+        sample.ApparentAgeValues[3] = [np.nan] * sample.Info.experiment.step_num
+        sample.ApparentAgeValues[4] = [np.nan] * sample.Info.experiment.step_num
+        sample.ApparentAgeValues[5] = [np.nan] * sample.Info.experiment.step_num
+        # degas
+        sample.DegasValues = res[2:2 + 32]
         # isochron data
-        isochron_1 = res[2:7]
-        isochron_2 = res[7:12]
-        sample.IsochronValues[0:5] = isochron_1
-        sample.IsochronValues[6:11] = isochron_2
+        sample.IsochronValues = res[2 + 32:2 + 32 + 39]
+        # 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])
 
 
 def monte_carlo_f(sample: Sample):
@@ -502,8 +648,49 @@ def monte_carlo_f(sample: Sample):
     -------
 
     """
+    try:
+        params_to_check = {
+            'unknows': {'data': sample.SampleIntercept[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k5', },
+            'blanks': {'data': sample.BlankIntercept[0:10], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k6', },
+            'mass': [
+                {'data': sample.TotalParam[71:81:2], 'dtype': float, 'func': lambda x: np.isfinite(x) and x > 0, 'class': 'k7', },
+                {'data': sample.TotalParam[72:81:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k7', },
+            ],
+            'gain': [
+                {'data': sample.TotalParam[126:136:2], 'dtype': float, 'func': lambda x: np.isfinite(x) and x > 0, 'class': 'k8', },
+                {'data': sample.TotalParam[126:136:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k8', },
+            ],
+            'mdf': [
+                {'data': sample.TotalParam[69], 'dtype': float, 'func': lambda x: np.isfinite(x) and x != 0, 'class': 'k9', },
+                {'data': sample.TotalParam[70], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k9', },
+            ],
+            'decay consts': [
+                {'data': sample.TotalParam[42:48:2], 'dtype': float, 'func': lambda x: np.isfinite(x) and x > 0, 'class': 'k10', },
+                {'data': sample.TotalParam[43:48:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k10', },
+            ],
+            'normalization factor': [
+                {'data': sample.TotalParam[136], 'dtype': float, 'func': lambda x: np.isfinite(x) and x > 0, 'class': 'k4', },
+                {'data': sample.TotalParam[137], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k4', },
+            ],
+            'interference params': [
+                {'data': sample.TotalParam[8:18], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k11', },
+                {'data': sample.TotalParam[0:2], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k11', },
+                {'data': sample.TotalParam[4:6], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k11', },
+                {'data': sample.TotalParam[56:58], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k11', },
+                {'data': sample.TotalParam[32], 'dtype': float, 'func': lambda x: np.isfinite(x), 'class': 'k11', },
+                {'data': sample.TotalParam[27], 'dtype': str, 'func': lambda x: all(
+                    [len(re.findall(r"\d+", item)) >= 5 for item in list(filter(None, re.split(r'[DS]', x)))[::2]]), 'class': 'k11', },
+                {'data': sample.TotalParam[27], 'dtype': str, 'func': lambda x: all(
+                    [isinstance(float(item), float) for item in list(filter(None, re.split(r'[DS]', x)))[1::2]]), 'class': 'k11', },
+            ],
+            'experiment datetime': {'data': sample.TotalParam[31], 'dtype': str, 'func': lambda x: len(re.findall(r"\d+", x)) >= 5, 'class': 'k12', },
+        }
+    except (IndexError, AttributeError) as e:
+        raise
+    if not validate_params(**params_to_check):
+        return
 
-    sequence_num = sample.sequence().size
+    sequence_num = sample.Info.experiment.step_num
 
     ar40m = np.transpose(sample.SampleIntercept[8:10])
     ar39m = np.transpose(sample.SampleIntercept[6:8])
@@ -544,16 +731,15 @@ def monte_carlo_f(sample: Sample):
     R38v36a = np.transpose(sample.TotalParam[4:6])
     R36v38clp = np.transpose(sample.TotalParam[56:58])
 
-    JNFactor = np.transpose(sample.NormalizeFactor)
-
     stand_time_year = np.transpose(sample.TotalParam[32])
+    JNFactor = np.transpose(sample.TotalParam[136:138])
 
     irradiation_cycles = [list(filter(None, re.split(r'[DS]', each_step))) for each_step in sample.TotalParam[27]]
     t1 = [re.findall(r"\d+", i) for i in sample.TotalParam[31]]  # t1: experimental times
     t2, t3 = [], []  # t2: irradiation times, t3: irradiation durations
     for each_step in irradiation_cycles:
         t2.append([re.findall(r"\d+", item) for i, item in enumerate(each_step) if i % 2 == 0])
-        t3.append([item for i, item in enumerate(each_step) if i % 2 == 1])
+        t3.append([float(item) for i, item in enumerate(each_step) if i % 2 == 1])
 
     # for i in range(sequence_num):
     #     P37Decay = calc.corr.get_decay_factor(t1[i], t2[i], t3[i], L37ar[i][0], L37ar[i][0] * L37ar[i][1] / 100)
@@ -565,8 +751,6 @@ def monte_carlo_f(sample: Sample):
 
     for i in range(sequence_num):
 
-        print(f"Monte Carlo Simulation For sequence {i + 1}")
-
         res = calc.corr.Monte_Carlo_F(
             ar40m=ar40m[i], ar39m=ar39m[i], ar38m=ar38m[i], ar37m=ar37m[i], ar36m=ar36m[i],
             ar40b=ar40b[i], ar39b=ar39b[i], ar38b=ar38b[i], ar37b=ar37b[i], ar36b=ar36b[i],
@@ -578,10 +762,12 @@ def monte_carlo_f(sample: Sample):
             R40v39k=R40v39k[i], R38v39k=R38v39k[i],
             R36v38clp=R36v38clp[i],
             L37ar=L37ar[i], L39ar=L39ar[i], L36cl=L36cl[i],
-            MDFunc=None,
             MDF=MDF[i], stand_time_year=stand_time_year[i],
-            JNFactor=JNFactor,
-            blank_gain_corr=sample.TotalParam[111][i]
+            JNFactor=JNFactor[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,
         )
 
         yield res