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

ararpy/smp/sample.py

@@ -22,47 +22,73 @@ from types import MethodType
 import pandas as pd
 
 SAMPLE_INTERCEPT_HEADERS = [
-    'Sequence', '',  # 0-1
+    'Sequence', '', 'Mark',  # 0-2
     '\u00B3\u2076Ar', '1\u03C3', '\u00B3\u2077Ar', '1\u03C3',  # 2-5
     '\u00B3\u2078Ar', '1\u03C3', '\u00B3\u2079Ar', '1\u03C3',  # 6-9
     '\u2074\u2070Ar', '1\u03C3',  # 10-11
 ]
 BLANK_INTERCEPT_HEADERS = [
-    'Sequence', '',  # 0-1
+    'Sequence', '', 'Mark',  # 0-2
     '\u00B3\u2076Ar', '1\u03C3', '\u00B3\u2077Ar', '1\u03C3',  # 2-5
     '\u00B3\u2078Ar', '1\u03C3', '\u00B3\u2079Ar', '1\u03C3',  # 6-9
     '\u2074\u2070Ar', '1\u03C3',  # 10-11
 ]
 CORRECTED_HEADERS = [
-    'Sequence', '',  # 0-1
+    'Sequence', '', 'Mark',  # 0-2
     '\u00B3\u2076Ar', '1\u03C3', '\u00B3\u2077Ar', '1\u03C3',  # 2-5
     '\u00B3\u2078Ar', '1\u03C3', '\u00B3\u2079Ar', '1\u03C3',  # 6-9
     '\u2074\u2070Ar', '1\u03C3',  # 10-11
 ]
 DEGAS_HEADERS = [
-    'Sequence', '',  # 0-1
-    '\u00B3\u2076Ar[a]', '1\u03C3', '\u00B3\u2076Ar[c]', '1\u03C3',  # 2-5
-    '\u00B3\u2076Ar[Ca]', '1\u03C3', '\u00B3\u2076Ar[Cl]', '1\u03C3',  # 6-9
-    '\u00B3\u2077Ar[Ca]', '1\u03C3', '\u00B3\u2078Ar[Cl]', '1\u03C3',  # 10-13
-    '\u00B3\u2078Ar[a]', '1\u03C3', '\u00B3\u2078Ar[c]', '1\u03C3',  # 14-17
-    '\u00B3\u2078Ar[K]', '1\u03C3', '\u00B3\u2078Ar[Ca]', '1\u03C3',  # 18-21
-    '\u00B3\u2079Ar[K]', '1\u03C3', '\u00B3\u2079Ar[Ca]', '1\u03C3',  # 22-25
-    '\u2074\u2070Ar[r]', '1\u03C3', '\u2074\u2070Ar[a]', '1\u03C3',  # 26-29
-    '\u2074\u2070Ar[c]', '1\u03C3', '\u2074\u2070Ar[K]', '1\u03C3'  # 30-33
+    'Sequence', '', 'Mark',  # 0-2
+    '\u00B3\u2076Ar[a]', '1\u03C3', '\u00B3\u2076Ar[c]', '1\u03C3',  # 3
+    '\u00B3\u2076Ar[Ca]', '1\u03C3', '\u00B3\u2076Ar[Cl]', '1\u03C3',  # 7
+    '\u00B3\u2077Ar[Ca]', '1\u03C3', '\u00B3\u2078Ar[Cl]', '1\u03C3',  # 11
+    '\u00B3\u2078Ar[a]', '1\u03C3', '\u00B3\u2078Ar[c]', '1\u03C3',  # 15
+    '\u00B3\u2078Ar[K]', '1\u03C3', '\u00B3\u2078Ar[Ca]', '1\u03C3',  # 19
+    '\u00B3\u2079Ar[K]', '1\u03C3', '\u00B3\u2079Ar[Ca]', '1\u03C3',  # 23
+    '\u2074\u2070Ar[r]', '1\u03C3', '\u2074\u2070Ar[a]', '1\u03C3',  # 27
+    '\u2074\u2070Ar[c]', '1\u03C3', '\u2074\u2070Ar[K]', '1\u03C3'  # 31-34
 ]
 PUBLISH_TABLE_HEADERS = [
-    'Sequence', '',  # 0-1
+    'Sequence', '', 'Mark',  # 0-2
+    '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',  # 2-4
+    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]',  # 5-6
+    'Apparent Age', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%',  # 7-10
+    'Ca/K', '1\u03C3',  # 11-12
+]
+PUBLISH_TABLE_HEADERS_AIR = [
+    'Sequence', '', 'Mark',  # 0-2
     '\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
+    'MDF', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2076Ar%',  # 7-10
+    'Ca/K', '1\u03C3',  # 11-12
+]
+PUBLISH_TABLE_HEADERS_STD = [
+    'Sequence', '', 'Mark',  # 0-2
+    '\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 = [
-    'Sequence', '',  # 0-1
+    'Sequence', '', 'Mark',  # 0-2
     '\u2074\u2070Ar/\u00B3\u2079Ar', '1\u03C3',  # 2-3
     'Apparent Age', '1\u03C3', '1\u03C3', '1\u03C3',  # 4-7
     '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%',  # 8-9
 ]
+SPECTRUM_TABLE_HEADERS_AIR = [
+    'Sequence', '', 'Mark',  # 0-2
+    '\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', '', 'Mark',  # 0-2
+    '\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
@@ -81,84 +107,88 @@ ISOCHRON_TABLE_HEADERS = [
     'r1', 'r2', 'r3',  # 39-41
 ]
 TOTAL_PARAMS_HEADERS = [
-    'Sequence', '',  # 0-1
+    'Sequence', '', 'Mark',  # 0-2
     '(\u2074\u2070Ar/\u00B3\u2076Ar)t', '%1\u03C3',
-    '(\u2074\u2070Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 2-5
+    '(\u2074\u2070Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 3-6
     '(\u00B3\u2078Ar/\u00B3\u2076Ar)t', '%1\u03C3',
-    '(\u00B3\u2078Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 6-9
+    '(\u00B3\u2078Ar/\u00B3\u2076Ar)c', '%1\u03C3',  # 7-10
     '(\u00B3\u2079Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',
     '(\u00B3\u2078Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',
-    '(\u00B3\u2076Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',  # 10-15
+    '(\u00B3\u2076Ar/\u00B3\u2077Ar)Ca', '%1\u03C3',  # 11-16
     '(\u2074\u2070Ar/\u00B3\u2079Ar)K', '%1\u03C3',
-    '(\u00B3\u2078Ar/\u00B3\u2079Ar)K', '%1\u03C3',  # 16-19
-    '(\u00B3\u2076Ar/\u00B3\u2078Ar)Cl', '%1\u03C3',  # 20-21
-    'K/Ca', '%1\u03C3', 'K/Cl', '%1\u03C3', 'Ca/Cl', '%1\u03C3',  # 22-27
-    'Cycle Number', 'Irradiation Cycles',  # 28-29
-    'Irradiation', 'duration', 'Irradiation Time', 'Experiment Time',  # 30-33
-    'Storage Years', '',  # 34-35
-    'Decay Constant \u2074\u2070K', '%1\u03C3',  # 36-37
-    'Decay Constant \u2074\u2070K(EC)', '%1\u03C3',  # 38-39
-    'Decay Constant \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 40-41
-    'Decay Constant \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 42-43
-    'Decay Constant \u00B3\u2079Ar', '%1\u03C3',  # 44-45
-    'Decay Constant \u00B3\u2077Ar', '%1\u03C3',  # 46-47
-    'Decay Constant \u00B3\u2076Cl', '%1\u03C3',  # 48-49
-    'Decay Activity \u2074\u2070K', '%1\u03C3',  # 50-51
-    'Decay Activity \u2074\u2070K(EC)', '%1\u03C3',  # 52-53
-    'Decay Activity \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 54-55
-    'Decay Activity \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 56-57
-    '\u00B3\u2076Cl/\u00B3\u2078Cl Productivity', '%1\u03C3',  # 58-59
-    'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',  # 60-66
-    '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3',  # 67-68
-    'J', '%1\u03C3', 'MDF', '%1\u03C3',  # 69-72
-    'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',  # 73-76
-    'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',  # 77-80
-    'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3',  # 81-84
+    '(\u00B3\u2078Ar/\u00B3\u2079Ar)K', '%1\u03C3',  # 17-20
+    '(\u00B3\u2076Ar/\u00B3\u2078Ar)Cl', '%1\u03C3',  # 21-22
+    'K/Ca', '%1\u03C3', 'K/Cl', '%1\u03C3', 'Ca/Cl', '%1\u03C3',  # 23-28
+    'Cycle Number', 'Irradiation Cycles',  # 29-30
+    'Irradiation', 'duration', 'Irradiation Time', 'Experiment Time',  # 31-34
+    'Storage Years', '',  # 35-36
+    'Decay Constant \u2074\u2070K', '%1\u03C3',  # 37-38
+    'Decay Constant \u2074\u2070K(EC)', '%1\u03C3',  # 39-40
+    'Decay Constant \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 41-42
+    'Decay Constant \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 43-44
+    'Decay Constant \u00B3\u2079Ar', '%1\u03C3',  # 45-46
+    'Decay Constant \u00B3\u2077Ar', '%1\u03C3',  # 47-48
+    'Decay Constant \u00B3\u2076Cl', '%1\u03C3',  # 49-50
+    'Decay Activity \u2074\u2070K', '%1\u03C3',  # 51-52
+    'Decay Activity \u2074\u2070K(EC)', '%1\u03C3',  # 53-54
+    'Decay Activity \u2074\u2070K(\u03B2<sup>-</sup>)', '%1\u03C3',  # 55-56
+    'Decay Activity \u2074\u2070K(\u03B2<sup>+</sup>)', '%1\u03C3',  # 57-58
+    '\u00B3\u2076Cl/\u00B3\u2078Cl Productivity', '%1\u03C3',  # 59-60
+    'Std Name', 'Std Age', '1\u03C3', '\u2074\u2070Ar%', '1\u03C3', 'K%', '1\u03C3',  # 61-67
+    '\u2074\u2070Ar<sup>*</sup>/K', '1\u03C3',  # 68-69
+    'J', '%1\u03C3', 'MDF', '%1\u03C3',  # 70-73
+    'Mass \u00B3\u2076Ar', '%1\u03C3', 'Mass \u00B3\u2077Ar', '%1\u03C3',  # 74-77
+    'Mass \u00B3\u2078Ar', '%1\u03C3', 'Mass \u00B3\u2079Ar', '%1\u03C3',  # 78-81
+    'Mass \u2074\u2070', '%1\u03C3', 'K Mass', '%1\u03C3',  # 82-85
     'No', '%1\u03C3', 'Year', '%1\u03C3', '\u2074\u2070K/K', '%1\u03C3',
-    '\u00B3\u2075Cl/\u00B3\u2077Cl', '%1\u03C3', 'HCl/Cl', '%1\u03C3',  # 85-94
-    '\u2074\u2070Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 95-96
-    '\u00B3\u2078Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 97-98
-    'Isochron Fitting', 'Convergence', 'Iteration', 'Discrimination',  # 99-102
-    'Not Zero', 'Corr Blank', 'Corr Discr', 'Corr \u00B3\u2077Ar Decay',  # 103-106
-    'Corr \u00B3\u2079Ar Decay',  # 107
-    'Ca Degassing', 'K Degassing', 'Cl Degassing', 'Trap Degassing',  # 108-111
-    'Using Min Equation',  # 112
+    '\u00B3\u2075Cl/\u00B3\u2077Cl', '%1\u03C3', 'HCl/Cl', '%1\u03C3',  # 86-95
+    '\u2074\u2070Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 96-97
+    '\u00B3\u2078Ar/\u00B3\u2076Ar air', '%1\u03C3',  # 98-99
+    'Isochron Fitting', 'Convergence', 'Iteration', 'Discrimination',  # 100-103
+    'Not Neg', 'Corr Blank', 'Corr Discr', 'Corr \u00B3\u2077Ar Decay',  # 104-107
+    'Corr \u00B3\u2079Ar Decay',  # 108
+    'Ca Degassing', 'K Degassing', 'Cl Degassing', 'Trap Degassing',  # 109-112
+    'Using Min Equation',  # 113
     # 'Recalibration', 'Using Std Age', 'Use Std Ratio',  # 112-115  to be completed
-    'Apply Gain Corr to Blanks',  # 113
-    '', '',  # 114-115
-    'Auto Plateau Method',  # 116 the index includes sequence name and unit
-    'Initial Ratio Model',  # 117
-    'Set1 initial Ratio',  # 118
-    '1\u03C3',  # 119
-    'Set2 initial Ratio',  # 120
-    '1\u03C3',  # 121
-    'Isotopic Errors',  # 122
-    'Parameter Errors',  # 123
-    'Plot Errors',  # 124
-    'Heating Time (s)',  # 125
-    'Heating Actual Temp (C)',  # 126
-    'Heating AT 1\u03C3',  # 127
-    '36Ar Gain', '%1\u03C3',  # 128-129
-    '37Ar Gain', '%1\u03C3',  # 130-131
-    '38Ar Gain', '%1\u03C3',  # 132-133
-    '39Ar Gain', '%1\u03C3',  # 134-135
-    '40Ar Gain', '%1\u03C3',  # 136-137
+    'Apply Gain Corr to Blanks',  # 114
+    'Monte Carlo Simulation for 40Arr/39Ark', '',  # 115-116
+    'Auto Plateau Method',  # 117 the index includes sequence name and unit
+    'Initial Ratio Model',  # 118
+    'Set1 initial Ratio',  # 119
+    '1\u03C3',  # 120
+    'Set2 initial Ratio',  # 121
+    '1\u03C3',  # 122
+    'Isotopic Errors',  # 123
+    'Parameter Errors',  # 124
+    'Plot Errors',  # 125
+    'Heating Time (s)',  # 126
+    'Heating Actual Temp (C)',  # 127
+    'Heating AT 1\u03C3',  # 128
+    '36Ar Gain', '%1\u03C3',  # 129-130
+    '37Ar Gain', '%1\u03C3',  # 131-132
+    '38Ar Gain', '%1\u03C3',  # 133-134
+    '39Ar Gain', '%1\u03C3',  # 135-136
+    '40Ar Gain', '%1\u03C3',  # 137-138
+    'Normalize Factor', '1\u03C3',  # 139-140
 ]
 
 SAMPLE_INTERCEPT_SHORT_HEADERS = [
-    'Seq', 'Label', 'Ar36', '1s', 'Ar37', '1s',
+    'Seq', 'Label', 'Mark',  # 0-2
+    'Ar36', '1s', 'Ar37', '1s',
     'Ar38', '1s', 'Ar39', '1s', 'Ar40', '1s'
 ]
 BLANK_INTERCEPT_SHORT_HEADERS = [
-    'Seq', 'Label', 'Ar36', '1s', 'Ar37', '1s',
+    'Seq', 'Label', 'Mark',  # 0-2
+    'Ar36', '1s', 'Ar37', '1s',
     'Ar38', '1s', 'Ar39', '1s', 'Ar40', '1s'
 ]
 CORRECTED_SHORT_HEADERS = [
-    'Seq', 'Label', 'Ar36', '1s', 'Ar37', '1s',
+    'Seq', 'Label', 'Mark',  # 0-2
+    'Ar36', '1s', 'Ar37', '1s',
     'Ar38', '1s', 'Ar39', '1s', 'Ar40', '1s'
 ]
 DEGAS_SHORT_HEADERS = [
-    'Seq', 'Label',  # 0-1
+    'Seq', 'Label', 'Mark',  # 0-2
     'Ar36[a]', '1s', 'Ar36[c]', '1s',  # 2-5
     'Ar36[Ca]', '1s', 'Ar36[Cl]', '1s',  # 6-9
     'Ar37[Ca]', '1s', 'Ar38[Cl]', '1s',  # 10-13
@@ -169,12 +199,14 @@ DEGAS_SHORT_HEADERS = [
     'Ar40[c]', '1s', 'Ar40[K]', '1s'  # 29-32
 ]
 PUBLISH_TABLE_SHORT_HEADERS = [
-    'Seq', 'Label', 'Ar36[a]', 'Ar37[Ca]', 'Ar38[Cl]',
+    'Seq', 'Label', 'Mark',  # 0-2
+    'Ar36[a]', 'Ar37[Ca]', 'Ar38[Cl]',
     'Ar39[K]', 'Ar40[r]', 'Apparent Age', '1s', 'Ar40r%',
     'Ar39K%', 'Ca/K', '1s'
 ]
 SPECTRUM_TABLE_SHORT_HEADERS = [
-    'Seq', 'Label', 'Ar40/Ar39', '1s', 'Apparent Age',
+    'Seq', 'Label', 'Mark',  # 0-2
+    'Ar40/Ar39', '1s', 'Apparent Age',
     '1s', '1s', '1s', 'Ar40[r]%', 'Ar39[K]%'
 ]
 ISOCHRON_TABLE_SHORT_HEADERS = [
@@ -195,83 +227,91 @@ ISOCHRON_TABLE_SHORT_HEADERS = [
     'r1', 'r2', 'r3',  # 39-41
 ]
 TOTAL_PARAMS_SHORT_HEADERS = [
-    'Seq', 'Label',  # 0-1
+    'Seq', 'Label', 'Mark',  # 0-2
     'T_40v36', '%1s',
-    'C_40v36', '%1s',  # 2-5
+    'C_40v36', '%1s',  # 3-6
     'T_38v36', '%1s',
-    'C_38v36', '%1s',  # 6-9
+    'C_38v36', '%1s',  # 7-10
     'Ca_39v37', '%1s',
     'Ca_38v37', '%1s',
-    'Ca_36v37', '%1s',  # 10-15
+    'Ca_36v37', '%1s',  # 11-16
     'K_40v39', '%1s',
-    'K_38v39', '%1s',  # 16-19
-    'Cl_36v38', '%1s',  # 20-21
-    'KvCa', '%1s', 'KvCl', '%1s', 'CavCl', '%1s',  # 22-27
-    'Ncy', 'Icy',  # 28-29
-    'Irr', 'Dur', 'IrrTime', 'ExpTime',  # 30-33
-    'StgY', '',  # 34-35
-    'DCK40', '%1s',  # 36-37
-    'DCeK40', '%1s',  # 38-39
-    'DCb-K40', '%1s',  # 40-41
-    'DCb+K40', '%1s',  # 42-43
-    'DCAr39', '%1s',  # 44-45
-    'DCAr37', '%1s',  # 46-47
-    'DCCl36', '%1s',  # 48-49
-    'DAK40', '%1s',  # 50-51
-    'DAeK40', '%1s',  # 52-53
-    'DAb-K40', '%1s',  # 54-55
-    'DAb+K40', '%1s',  # 56-57
-    'Cl36/Cl38P', '%1s',  # 58-59
-    'StdName', 'StdAge', '1s', 'Ar40%', '1s', 'K%', '1s',
-    'F', '1s',  # 60-68
-    'J', '%1s', 'MDF', '%1s',  # 69-72
+    'K_38v39', '%1s',  # 17-20
+    'Cl_36v38', '%1s',  # 21-22
+    'KvCa', '%1s', 'KvCl', '%1s', 'CavCl', '%1s',  # 23-28
+    'Ncy', 'Icy',  # 29-30
+    'Irr', 'Dur', 'IrrTime', 'ExpTime',  # 31-34
+    'StgY', '',  # 35-36
+    'DCK40', '%1s',
+    'DCeK40', '%1s',
+    'DCb-K40', '%1s',
+    'DCb+K40', '%1s',
+    'DCAr39', '%1s',
+    'DCAr37', '%1s',
+    'DCCl36', '%1s',
+    'DAK40', '%1s',
+    'DAeK40', '%1s',
+    'DAb-K40', '%1s',
+    'DAb+K40', '%1s',
+    'Cl36/Cl38P', '%1s',  # 37-60
+    'StdName', 'StdAge', '1s', 'Ar40%', '1s', 'K%', '1s',  # 61-67
+    'F', '1s',  # 68-69
+    'J', '%1s', 'MDF', '%1s',  # 70-73
     'MassAr36', '%1s', 'MassAr37', '%1s',
     'MassAr38', '%1s', 'MassAr39', '%1s',
-    'MassK40', '%1s', 'MassK', '%1s',  # 73-84
+    'MassK40', '%1s', 'MassK', '%1s',  # 74-85
     'No', '%1s', 'Year', '%1s', 'K40/K', '%1s',
-    'Cl35/Cl37', '%1s', 'HCl/Cl', '%1s',  # 85-94
+    'Cl35/Cl37', '%1s', 'HCl/Cl', '%1s',  # 86-95
     'Ar40/Ar36Air', '%1s',
-    'Ar38/Ar36Air', '%1s',  # 95-98
-    'IsochronFitting', 'Convergence', 'Iteration', 'Discrimination',  # 99-102
-    'NotZero', 'CorrBlank', 'CorrDiscr', 'CorrAr37Decay',
-    'CorrAr39Decay',  # 103-107
-    'CaDegassing', 'KDegassing', 'ClDegassing', 'TrapDegassing',  # 108-111
-    'UsingMin',  # 112
+    'Ar38/Ar36Air', '%1s',  # 96-99
+    'IsochronFitting', 'Convergence', 'Iteration', 'Discrimination',  # 100-103
+    'NotNeg', 'CorrBlank', 'CorrDiscr', 'CorrAr37Decay',
+    'CorrAr39Decay',  # 104-108
+    'CaDegassing', 'KDegassing', 'ClDegassing', 'TrapDegassing',  # 109-112
+    'UsingMin',  # 113
     # 'Recalibration', 'Using Std Age', 'Use Std Ratio',  # 112-115  to be completed
-    'BlankGainCorr',  # 113
-    '', '',  # 114-115
-    'AutoPlateauMethod',  # 116 the index includes sequence name and unit
-    'InitialRatioModel',  # 117
-    'Set1InitialRatio',  # 118
-    '1s',  # 119
-    'Set2InitialRatio',  # 120
-    '1s',  # 121
-    'IsotopicErrors',  # 122
-    'ParameterErrors',  # 123
-    'PlotErrors',  # 124
-    'HeatingTime',  # 125
-    'HeatingActualTemp',  # 126
-    'HeatingActualTempError',  # 127
-    '36Gain', '%1s',  # 128-129
-    '37Gain', '%1s',  # 130-131
-    '38Gain', '%1s',  # 132-133
-    '39Gain', '%1s',  # 134-135
-    '40Gain', '%1s',  # 136-137
+    'BlankGainCorr',  # 114
+    'MonteCarlo', '',  # 115-116
+    'AutoPlateauMethod',  # 117 the index includes sequence name and unit
+    'InitialRatioModel',  # 118
+    'Set1InitialRatio',  # 119
+    '1s',  # 120
+    'Set2InitialRatio',  # 121
+    '1s',  # 122
+    'IsotopicErrors',  # 123
+    'ParameterErrors',  # 124
+    'PlotErrors',  # 125
+    'HeatingTime',  # 126
+    'HeatingActualTemp',  # 127
+    'HeatingActualTempError',  # 128
+    '36Gain', '%1s',
+    '37Gain', '%1s',
+    '38Gain', '%1s',
+    '39Gain', '%1s',
+    '40Gain', '%1s',  # 129-138
+    'NormalizeFactor', '1\u03C3',  # 139-140
 ]
 
-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', },
@@ -743,7 +783,7 @@ DEFAULT_PLOT_STYLES = {
     },
 }
 
-VERSION = '20250404'
+VERSION = '20251231'
 
 NAMED_DICT = {
     "unknown": {"header": SAMPLE_INTERCEPT_HEADERS.copy()},
@@ -784,9 +824,51 @@ class ArArData(ArArBasic):
 class Sample:
 
     def __init__(self, **kwargs):
+
+        # self.__version = '20230521'
+        # self.__version = '20230709'  # add labels to isochron plots
+        # self.__version = '20230724'  # change header
+        # self.__version = '20230730'  # delete calcparams attribute
+        # self.__version = '20230827'  # using merge smp to update arr version
+        # self.__version = '20231116'  # change smp parameters
+        # self.__version = '20240730'  # change parameter table for thermo calculation
+        # self.__version = '20241028'  # gain correction
+        # self.__version = '20250102'  # gain correction to blanks
+        # self.__version = '20250301'  # update sample info
+        # self.__version = '20250321'  # error sigma adjustment
+        # self.__version = '20250328'  # Experiment info
+        # self.__version = '20250404'  # J normalization factor
+        # self.__version = '20251001'  # add marker col for all tables
+        self.__version = '20251231'  # move montecarlo to params-112
+
         self.Doi = ""
         self.RawData = RawData()
-        self.Info = ArArBasic()
+        self.Info = ArArBasic(
+            id='0', name='', attr_name='', arr_version=self.__version,
+            experiment=ArArBasic(name='', type='', instrument='', mass_spec='', collectors='', step_num=0, ),
+            sample=ArArBasic(name='', material='', location='', type='', method='', sequence_unit='', weight='', ),
+            researcher=ArArBasic(name='', addr='', email='', ),
+            laboratory=ArArBasic(name='', addr='', email='', info='', analyst='', ),
+            results=ArArBasic(
+                name='', plateau_F=[], plateau_age=[], total_F=[], total_age=[], isochron_F=[], isochron_age=[], J=[],
+                isochron={
+                    'figure_2': {0: {}, 1: {}, 2: {}, },
+                    'figure_3': {0: {}, 1: {}, 2: {}, },
+                    'figure_4': {0: {}, 1: {}, 2: {}, },
+                    'figure_5': {0: {}, 1: {}, 2: {}, },
+                    'figure_6': {0: {}, 1: {}, 2: {}, },
+                    'figure_7': {0: {}, 1: {}, 2: {}, },
+                },
+                age_plateau= {0: {}, 1: {}, 2: {}},
+                age_spectra= {'TGA': {}, 0: {}, 1: {}, 2: {}, },
+                selection={0: {'data': [], 'name': 'set1'},
+                           1: {'data': [], 'name': 'set2'},
+                           2: {'data': [], 'name': 'set3'}}
+            ),
+            reference=ArArBasic(name='', journal='', doi='', ),
+            preference=ArArBasic(decimal_places='', to_precision='', confidence_level='', age_unit='', ),
+            irradiation= ArArBasic(label='', pos_h='', pos_x='', pos_y='', )
+        )
 
         self.SequenceName = []
         self.SequenceValue = []
@@ -812,7 +894,6 @@ class Sample:
         self.SelectedSequence2 = []
         self.UnselectedSequence = []
         self.IsochronMark = []
-        self.NormalizeFactor = [[], []]
 
         # Tables and Plots
         self.UnknownTable = Table()
@@ -837,25 +918,16 @@ class Sample:
         for k, v in kwargs.items():
             setattr(self, k, v)
 
-        # self.Components = {}
-
-        # self.__version = '20230521'
-        # self.__version = '20230709'  # add labels to isochron plots
-        # self.__version = '20230724'  # change header
-        # self.__version = '20230730'  # delete calcparams attribute
-        # self.__version = '20230827'  # using merge smp to update arr version
-        # self.__version = '20231116'  # change smp parameters
-        # self.__version = '20240730'  # change parameter table for thermo calculation
-        # self.__version = '20241028'  # gain correction
-        # self.__version = '20250102'  # gain correction to blanks
-        # self.__version = '20250301'  # update sample info
-        # self.__version = '20250321'  # error sigma adjustment
-        # self.__version = '20250328'  # Experiment info
-        self.__version = '20250404'  # J normalization factor
-
     @property
     def version(self):
-        return self.__version
+        return self.Info.arr_version
+
+    @version.setter
+    def version(self, v):
+        if isinstance(v, (str, int)) and str(v).startswith("20"):
+            self.Info.arr_version = self.__version = str(v)
+        else:
+            raise ValueError("Version setter Error")
 
     def help(self) -> str: ...
     
@@ -893,7 +965,7 @@ class Sample:
 
     def initial(self): ...
 
-    def set_selection(self): ...
+    def set_selection(self, index: int, mark: int): ...
 
     def update_table(self, data: list, table_id: name): ...
 
@@ -973,17 +1045,25 @@ class Table:
             setattr(self, k, v)
         self.set_coltypes()
 
-    def set_coltypes(self):
-        for i in self.text_indexes:
-            if i < self.colcount:
+    def set_coltypes(self, text_indexes=None):
+        if text_indexes is not None:
+            self.text_indexes = text_indexes
+        if not isinstance(self.text_indexes, list):
+            raise TypeError(f"Text_indexes is not allowed: {self.text_indexes}")
+        for i in range(self.colcount):
+            if i in self.text_indexes:
                 self.coltypes[i].update({'type': 'text'})
-        for i in self.numeric_indexes:
-            if i < self.colcount:
+            else:
                 self.coltypes[i].update({
                     'type': 'numeric',
                     'numericFormat': {'pattern': {'mantissa': self.decimal_places}},
                 })
 
+    def set_colcount(self, c: int):
+        self.colcount = c
+        while len(self.coltypes) < c:
+            self.coltypes.append({'type': 'text'})
+
 
 class Plot:
     def __init__(self, id='', type='', name='', data=None, info=None, **kwargs):
@@ -1077,27 +1157,33 @@ class Plot:
 
 class Sequence:
     def __init__(self, index=None, data=None, flag=None, name=None, datetime=None,
-                 type_str=None, results=None, coefficients=None, fitting_method=None,
+                 type_str=None, label=None, results=None, coefficients=None, fitting_method=None,
                  is_estimated=False, options=None, **kwargs):
         if options is None:
             options = {}
-        self.index = index
         if name is None or not isinstance(name, str):
-            name = ""
-        self.name = name.strip()
-        self.datetime = datetime
-        self.data = data
+            name = options.get('StepName', "")
         # flag is to check if the data point is selected
         if flag is None and data is not None:
             flag = [[j if i == 0 else True for i, j in enumerate(_m)] for _m in data]
-        self.flag = flag
-        self.type_str = type_str
+        if type_str is None:
+            type_str = options.get('StepType', "Unknown")
+        if label is None:
+            label = options.get('StepLabel', "")
         if results is None:
             results = []
         if fitting_method is None:
             fitting_method = []
         if coefficients is None:
             coefficients = []
+
+        self.index = index
+        self.datetime = datetime
+        self.data = data
+        self.name = name.strip()
+        self.flag = flag
+        self.type_str = type_str.strip()
+        self.label = str(label).strip()
         self.results = results
         self.coefficients = coefficients
         self.fitting_method = fitting_method
@@ -1115,9 +1201,7 @@ class Sequence:
     def as_type(self, type_str):
         if str(type_str).lower() in ["blk", "b", "blank"]:
             self.type_str = "blank"
-        if str(type_str).lower() in ["a", "air"]:
-            self.type_str = "air"
-        if self.type_str not in ["blank", "air"]:
+        else:
             self.type_str = "unknown"
 
     __as_type = as_type
@@ -1126,10 +1210,7 @@ class Sequence:
         return self.type_str == "blank"
 
     def is_unknown(self):
-        return self.type_str != "blank" and self.type_str != "air"
-
-    def is_air(self):
-        return self.type_str == "air"
+        return self.type_str != "blank"
 
     def as_blank(self):
         return self.as_type("blank")
@@ -1137,9 +1218,6 @@ class Sequence:
     def as_unknown(self):
         return self.as_type("unknown")
 
-    def as_air(self):
-        return self.as_type("air")
-
     def get_data_df(self):
         ...
 
@@ -1168,7 +1246,7 @@ class RawData:
         self.unit = unit
         self.isotopic_num = isotopic_num
         self.sequence_num = sequence_num
-        self.interpolated_blank = None
+        self.interpolated_blank = []
         if sequence is not None:
             self.sequence = sequence
         elif data is not None:
@@ -1178,9 +1256,8 @@ class RawData:
                     name=item[0][0] if isinstance(item[0][0], str) and item[0][0] != '' else f"{self.name}-{index + 1:02d}",
                     data=item[1:],
                     datetime=item[0][1],
-                    type_str=item[0][2],
                     fitting_method=[*kwargs.get("fitting_method", [0] * 5)],
-                    options=item[0][3]
+                    options=item[0][2],
                 ) for index, item in enumerate(data)]
         else:
             self.sequence: List[Sequence] = []
@@ -1214,8 +1291,5 @@ class RawData:
     def get_blank(self) -> Union[Sequence, List]:
         ...
 
-    def get_air(self) -> Union[Sequence, List]:
-        ...
-
     def to_sample(self, mapping: Optional[List[dict]]) -> Sample:
         ...