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

ararpy/__init__.py

@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
 """ Information """
 
 name = 'ararpy'
-version = '0.2.4'
+version = '0.2.5'
 __version__ = version
 full_version = version
-last_update = '2026-01-07'
+last_update = '2026-01-08'
 
 """ ArArPy Functions """
 

ararpy/files/arr_file.py

@@ -27,7 +27,7 @@ def save(file_path, sample):
     str, file name
     """
     if not file_path.endswith(".arr"):
-        file_path = os.path.join(file_path, f"{sample.Info.sample.name}.arr")
+        file_path = os.path.join(file_path, f"{sample.Info.experiment.name}.arr")
     with open(file_path, 'wb') as f:
         f.write(pickle.dumps(sample))
     # with open(file_path, 'w') as f:

ararpy/files/raw_file.py

@@ -411,39 +411,42 @@ def get_sample_info(file_contents: list, index_list: list, default="", base: Uni
     """
     sample_info = DEFAULT_SAMPLE_INFO.copy()
     sample_info.update({
-        "ExpName": get_item(file_contents, index_list[0:3], default=default, base=base).strip(),
-        "StepName": get_item(file_contents, index_list[3:6], default=default, base=base).strip(),
-        "StepType": get_item(file_contents, index_list[6:9], default=default, base=base).strip(),
-        "StepLabel": get_item(file_contents, index_list[9:12], default=default, base=base).strip(),
-        "ZeroYear": get_item(file_contents, index_list[12:15], default=default, base=base).strip(),
-        "ZeroHour": get_item(file_contents, index_list[15:18], default=default, base=base).strip(),
-        "ZeroMon": get_item(file_contents, index_list[18:21], default=default, base=base).strip(),
-        "ZeroMin": get_item(file_contents, index_list[21:24], default=default, base=base).strip(),
-        "ZeroDay": get_item(file_contents, index_list[24:27], default=default, base=base).strip(),
-        "ZeroSec": get_item(file_contents, index_list[27:30], default=default, base=base).strip(),
-        "SmpName": get_item(file_contents, index_list[30:33], default=default, base=base).strip(),
-        "SmpLoc": get_item(file_contents, index_list[33:36], default=default, base=base).strip(),
-        "SmpMatr": get_item(file_contents, index_list[36:39], default=default, base=base).strip(),
-        "ExpType": get_item(file_contents, index_list[39:42], default=default, base=base).strip(),
-        "SmpWeight": get_item(file_contents, index_list[42:45], default=default, base=base).strip(),
-        "Stepunit": get_item(file_contents, index_list[45:48], default=default, base=base).strip(),
-        "HeatingTime": get_item(file_contents, index_list[48:51], default=default, base=base).strip(),
-        "InstrName": get_item(file_contents, index_list[51:54], default=default, base=base).strip(),
-        "Researcher": get_item(file_contents, index_list[54:57], default=default, base=base).strip(),
-        "Analyst": get_item(file_contents, index_list[57:60], default=default, base=base).strip(),
-        "Lab": get_item(file_contents, index_list[60:63], default=default, base=base).strip(),
-        "Jv": get_item(file_contents, index_list[63:66], default=default, base=base).strip(),
-        "Jsig": get_item(file_contents, index_list[66:69], default=default, base=base).strip(),
-        "MDF": get_item(file_contents, index_list[69:72], default=default, base=base).strip(),
-        "MDFSig": get_item(file_contents, index_list[72:75], default=default, base=base).strip(),
-        "CalcName": get_item(file_contents, index_list[75:78], default=default, base=base).strip(),
-        "IrraName": get_item(file_contents, index_list[78:81], default=default, base=base).strip(),
-        "IrraLabel": get_item(file_contents, index_list[81:84], default=default, base=base).strip(),
-        "IrraPosH": get_item(file_contents, index_list[84:87], default=default, base=base).strip(),
-        "IrraPosX": get_item(file_contents, index_list[87:90], default=default, base=base).strip(),
-        "IrraPosY": get_item(file_contents, index_list[90:93], default=default, base=base).strip(),
-        "StdName": get_item(file_contents, index_list[93:96], default=default, base=base).strip(),
-        "StdAge": get_item(file_contents, index_list[96:99], default=default, base=base).strip(),
-        "StdAgeSig": get_item(file_contents, index_list[99:102], default=default, base=base).strip(),
+        "ExpName": get_item(file_contents, index_list[0:3], default=default, base=base),
+        "StepName": get_item(file_contents, index_list[3:6], default=default, base=base),
+        "StepType": get_item(file_contents, index_list[6:9], default=default, base=base),
+        "StepLabel": get_item(file_contents, index_list[9:12], default=default, base=base),
+        "ZeroYear": get_item(file_contents, index_list[12:15], default=default, base=base),
+        "ZeroHour": get_item(file_contents, index_list[15:18], default=default, base=base),
+        "ZeroMon": get_item(file_contents, index_list[18:21], default=default, base=base),
+        "ZeroMin": get_item(file_contents, index_list[21:24], default=default, base=base),
+        "ZeroDay": get_item(file_contents, index_list[24:27], default=default, base=base),
+        "ZeroSec": get_item(file_contents, index_list[27:30], default=default, base=base),
+        "SmpName": get_item(file_contents, index_list[30:33], default=default, base=base),
+        "SmpLoc": get_item(file_contents, index_list[33:36], default=default, base=base),
+        "SmpMatr": get_item(file_contents, index_list[36:39], default=default, base=base),
+        "ExpType": get_item(file_contents, index_list[39:42], default=default, base=base),
+        "SmpWeight": get_item(file_contents, index_list[42:45], default=default, base=base),
+        "Stepunit": get_item(file_contents, index_list[45:48], default=default, base=base),
+        "HeatingTime": get_item(file_contents, index_list[48:51], default=default, base=base),
+        "InstrName": get_item(file_contents, index_list[51:54], default=default, base=base),
+        "Researcher": get_item(file_contents, index_list[54:57], default=default, base=base),
+        "Analyst": get_item(file_contents, index_list[57:60], default=default, base=base),
+        "Lab": get_item(file_contents, index_list[60:63], default=default, base=base),
+        "Jv": get_item(file_contents, index_list[63:66], default=default, base=base),
+        "Jsig": get_item(file_contents, index_list[66:69], default=default, base=base),
+        "MDF": get_item(file_contents, index_list[69:72], default=default, base=base),
+        "MDFSig": get_item(file_contents, index_list[72:75], default=default, base=base),
+        "CalcName": get_item(file_contents, index_list[75:78], default=default, base=base),
+        "IrraName": get_item(file_contents, index_list[78:81], default=default, base=base),
+        "IrraLabel": get_item(file_contents, index_list[81:84], default=default, base=base),
+        "IrraPosH": get_item(file_contents, index_list[84:87], default=default, base=base),
+        "IrraPosX": get_item(file_contents, index_list[87:90], default=default, base=base),
+        "IrraPosY": get_item(file_contents, index_list[90:93], default=default, base=base),
+        "StdName": get_item(file_contents, index_list[93:96], default=default, base=base),
+        "StdAge": get_item(file_contents, index_list[96:99], default=default, base=base),
+        "StdAgeSig": get_item(file_contents, index_list[99:102], default=default, base=base),
     })
+    for key, val in sample_info.items():
+        if isinstance(val, str):
+            sample_info[key] = val.strip()
     return sample_info

ararpy/smp/initial.py

@@ -300,14 +300,18 @@ def check_version(smp: Sample):
     -------
 
     """
-    if smp.version != samples.VERSION:
-        std = initial(Sample())
-        basic.get_merged_smp(smp, std)
 
     try:
         version = int(smp.version)
     except ValueError:
         return smp
+    except AttributeError:
+        smp.version = "20240701"
+        return check_version(smp)
+
+    if smp.version != samples.VERSION:
+        std = initial(Sample())
+        basic.get_merged_smp(smp, std)
 
     # 20250328:  # Experiment info
     smp.Info.experiment.name = smp.name()
@@ -328,7 +332,7 @@ def check_version(smp: Sample):
 
     # 20250404:  # Normalization for steps with different J values
     # always check
-    if version < 1120250405:
+    if version < 99990101:
         doNormalize = True
         v, sv = [], []
         try:

ararpy/smp/plots.py

@@ -129,7 +129,7 @@ def get_iso_init(sample: Sample, figure: Plot):
     if figure.id != 'figure_7':
         for point in calc.arr.transpose(data[:5]):
             if '' not in point and None not in point:
-                ellipse_data.append(calc.isochron.get_ellipse(*point))
+                ellipse_data.append(calc.isochron.get_ellipse(*point, plt_sfactor=sample.Info.preference.confidence_level))
     return data, ellipse_data
 
 

ararpy/smp/sample.py

@@ -799,7 +799,7 @@ DEFAULT_PLOT_STYLES = lambda sample_type, age_unit: {
     },
 }
 
-VERSION = '20251231'
+VERSION = '20260101'
 
 NAMED_DICT = {
     "unknown": {"header": SAMPLE_INTERCEPT_HEADERS.copy()},

{ararpy-0.2.4.dist-info → ararpy-0.2.5.dist-info}/METADATA

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

{ararpy-0.2.4.dist-info → ararpy-0.2.5.dist-info}/RECORD

@@ -5,7 +5,7 @@ ararpy/Example - Show MDD results.py,sha256=YFkiQual60lyCClsfvivr4REY6waSYuomf0u
 ararpy/Example - Show all Kfs age spectra.py,sha256=1edPtBpFfS0lC7vLnLu34mDHt_xjbc8ptk6rZ--pf-I,12304
 ararpy/Example - Show random walk results.py,sha256=8WWvbAI7ySiMR-XwtFe5kTQihW3mcqzL3S7EUZdoxYo,15477
 ararpy/Example - Tc calculation.py,sha256=sD9pu3IaZ8mBV95rV2wOEhlQUexFNqBUoBqnNMdUBis,19617
-ararpy/__init__.py,sha256=H-LaMP-KRGnQMY-ocBUgmRe9vohsJqj9gR-O_DZXSp0,5386
+ararpy/__init__.py,sha256=A0RSHLgX036fFBoFlOp1X6Zycw7J2KU5wmDkYfbM_5s,5386
 ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
 ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
 ararpy/calc/age.py,sha256=WOZs70zXiBWDIEhXJLIaNiYTOFJNk0NDbH5e5zCbCks,5435
@@ -40,11 +40,11 @@ ararpy/examples/WHA.pdf,sha256=iopbptHkWPmYdgihEVDDfv2nm2XE-Q-e7fFnkR44Xh0,17869
 ararpy/examples/raw_example.xls,sha256=ftcSiXRx_7nYnbqJVma1Yl3Yr_iuceAWlEjhJwlAvFM,1929895
 ararpy/examples/sample-default.smp,sha256=YNkoQGgPrsL_fXS7ZHxfRtLQWekCDqT9czS6vBScImk,432
 ararpy/files/__init__.py,sha256=l5B5ZQ01WdtvjjN0aMkyAFNgpwANdM_1I0tQbqnRuEY,69
-ararpy/files/arr_file.py,sha256=pD5MxkAydL7cNq2wmKFUaOU4jHhc3MzTYrwbxZ3f46w,881
+ararpy/files/arr_file.py,sha256=-6FsNz73HOPUEEMGJyoFyDW1N31xGjSy1qz2ROpvq4k,885
 ararpy/files/basic.py,sha256=k2GXgZjhqSmKvpXQLjsXDksS_ZLvqD7AWW54fXnYvTI,1228
 ararpy/files/calc_file.py,sha256=-CZXmlHVf65hKMLhwp6eSewbxzxywXcnpycoEeLDhZA,29304
 ararpy/files/new_file.py,sha256=efblARIBROVLWS2w3-98BxLX5VZ8grRpiTkJFtf_rAk,214
-ararpy/files/raw_file.py,sha256=X2_RjlNOUbdkA9MM2ZMNlZmGL7jc1-eV-Wy-bIu2bb0,20592
+ararpy/files/raw_file.py,sha256=IECS9-Oi-GxPoRLOn77Gk20eFbbkY2fDk6dqLlKTafA,20440
 ararpy/files/xls.py,sha256=DVcZ_yRnc19p-m4leGGjt-YPDpSa2udYKmGyrM0qub0,640
 ararpy/smp/EXPORT_TO_PDF_DATA_PROPERTIES.py,sha256=baDM437tu6hsPv0uYfod0TREXlPd6kvMBFT1S9ZZlkk,3024
 ararpy/smp/__init__.py,sha256=k6_fa27UJsQK7K7oC5GYlwMo6l0Xd8af3QtOrZz2XJk,478
@@ -55,19 +55,19 @@ ararpy/smp/corr.py,sha256=uZY3P5TLuXK1kwDXWqF6zWHPiEH0Ovsx9L6xonzDYhY,37844
 ararpy/smp/diffusion_funcs.py,sha256=X6LC1XY-vub5BpAuZMlyA5k3DQcU8Qqf5uukwGjJOxw,186690
 ararpy/smp/export.py,sha256=XnLKjWk4LFqtqXdy2qCUkOLy0vkjMq-X-tE9A545BVE,120439
 ararpy/smp/info.py,sha256=tpEIjrE4nR-GAYTricBk9gq0LuHh6F1Bt7HPo1rS2HM,497
-ararpy/smp/initial.py,sha256=o3KcEx9nCIVJtdmy6BX_JZ_SjOmzWjAMffdm8JM01Vo,20119
+ararpy/smp/initial.py,sha256=PVI62cYgfKx3mNGwm-Vfym_XQxksRijzGVnaUxJET0A,20216
 ararpy/smp/json.py,sha256=zfJCC_2LCDckqC8Fpu10jEA6Knl3UtKO31I5g4fvsBE,2273
-ararpy/smp/plots.py,sha256=SrYlTFUzfcKnUnhVf04dyGx0eJmR2mbjG0VRE8LTJnU,34202
+ararpy/smp/plots.py,sha256=EpBE3lVtK7ZMQLEZTB2yvQtRYNSFYW4mBHAyMPA6XJY,34255
 ararpy/smp/raw.py,sha256=77J1dEYL4ZSeftp4tyog_Cy1Y5bwHNaLqJK4i4KLOSY,6500
-ararpy/smp/sample.py,sha256=ICW-Sy1fePQLMJLT8wR4KIK8Ikcc0zzeXBZ55gVxI3s,60478
+ararpy/smp/sample.py,sha256=zLQxPSqss9ucP0LS6Q6l_nRJvj19zlJ9k_ktztCQYh8,60478
 ararpy/smp/style.py,sha256=P7pAgBVpUzviJWyMiJXRE_NpzDf3ncNtFmUJHQGNFw0,8446
 ararpy/smp/table.py,sha256=iXJilp0V_kDyuTycjV82fBimuzLmVciAaL_av0zIb5Y,8540
 ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=ncw9DtxRfS6zlQbLVLNX7WNoO9sX_nSomwAsTH0_O3k,25910
 ararpy/thermo/basic.py,sha256=JJRZbYmvXlpRAV2FeFPwLhrig4ZhNQmJnWqgOjo-1YQ,11508
-ararpy-0.2.4.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.2.4.dist-info/METADATA,sha256=KaF8mrbZECHMeFN-h3w2r6YA9g6j04ozGPQ13-CoeRc,24726
-ararpy-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ararpy-0.2.4.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.2.4.dist-info/RECORD,,
+ararpy-0.2.5.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.2.5.dist-info/METADATA,sha256=cPOzmJPc9X2V2MEgLf3Pm_kr5eR5gffgiwsKwBGgRBI,24726
+ararpy-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ararpy-0.2.5.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.2.5.dist-info/RECORD,,