ararpy 0.1.27__py3-none-any.whl → 0.1.28__py3-none-any.whl

ararpy/smp/export.py

@@ -310,7 +310,7 @@ def getRectFromSpectra(data):
 
     """
     data = np.array(data)
-    return list(map(lambda index: [data[index,0], min(data[index,[1,2]]), np.diff(data[[index,index+1],0])[0], np.diff(data[index,[1,2]])[0]], list(range(len(data) - 1))))
+    return list(filter(lambda rect: rect[2] != 0 and rect[3] != 0, map(lambda index: [data[index,0], min(data[index,[1,2]]), abs(data[index+1,0] - data[index,0]), abs(data[index,1] - data[index,2])], list(range(len(data) - 1)))))
 
 
 def _get_additional_text_series(name):
@@ -364,7 +364,6 @@ def _get_plot_data_age_spectra_series(smp: sample, **options):
             plateau_data = np.array(set_data[index])
             # spectra_fill_data = list(map(lambda each: [data[0][each - 1], min(data[1][each], data[2][each]), data[0][each + 1] - data[0][each], sigma * abs(data[1][each] - data[2][each])], selection))
             spectra_fill_data = getRectFromSpectra(plateau_data)
-            print(spectra_fill_data)
             series.append({
                 'type': 'series.rect', 'id': f'rect-{smp.name()}-{get_random_digits()}', 'name': f'rect-{smp.name()}-{get_random_digits()}',
                 'color': ['red', 'blue'][index], 'fill_color': ['red', 'blue'][index], 'line_width': 0, 'line_style': 'none', 'z_index': 9,

ararpy/smp/initial.py

@@ -302,17 +302,20 @@ def check_version(smp: Sample):
     smp.Info.experiment.name = smp.name()
     smp.Info.experiment.step_num = smp.sequence().size
 
-    # 20250404
+    # 20250404:  # Normalization for steps with different J values
     doNormalize = True
     v, sv = [], []
-    if smp.Info.sample.type.lower() == "unknown":
-        v, sv = smp.TotalParam[67:69]
-        sv = np.multiply(v, sv) / 100
-    elif smp.Info.sample.type.lower() == "air":
-        v, sv = smp.TotalParam[93:95]
-        sv = np.multiply(v, sv) / 100
-    elif smp.Info.sample.type.lower() == "standard":
-        v, sv = smp.TotalParam[59:61]
+    try:
+        if smp.Info.sample.type.lower() == "unknown":
+            v, sv = smp.TotalParam[67:69]
+            sv = np.multiply(v, sv) / 100
+        elif smp.Info.sample.type.lower() == "air":
+            v, sv = smp.TotalParam[93:95]
+            sv = np.multiply(v, sv) / 100
+        elif smp.Info.sample.type.lower() == "standard":
+            v, sv = smp.TotalParam[59:61]
+    except:
+        doNormalize = False
     smp.NormalizeFactor = [
         [1 if v[0] == each or not doNormalize else v[0] / each for each in v],
         [0 if v[0] == v[i] or not doNormalize else err.div((v[0], sv[0]), (v[i], sv[i])) for i in range(len(v))]

{ararpy-0.1.27.dist-info → ararpy-0.1.28.dist-info}/METADATA

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

{ararpy-0.1.27.dist-info → ararpy-0.1.28.dist-info}/RECORD

@@ -46,9 +46,9 @@ ararpy/smp/calculation.py,sha256=LCFJWjLVLEKEQ5b7RFUIxsMahEzgLdodW4kCYXV5Z34,291
 ararpy/smp/consts.py,sha256=XIdjdz8cYxspG2jMnoItdlUsxr3hKbNFJjMZJh1bpzw,393
 ararpy/smp/corr.py,sha256=TzH7rymToJP0RCI0pQm-SrqnwAZ58HJbxahE8chv2wQ,26511
 ararpy/smp/diffusion_funcs.py,sha256=4-PMMIZWzjk2HOYYWNgSp4GmApygp1MmOxJ2g3xrqWc,175049
-ararpy/smp/export.py,sha256=VvpqV_WxScbJ1bcmS6lDiBCa2bIn-TuumUOcDo78ItA,116201
+ararpy/smp/export.py,sha256=hgbsbE70QoAyQSDZ2JJgOkltL6D9YMms_5MAuxAHq3U,116221
 ararpy/smp/info.py,sha256=iKUELm-BuUduDlJKC1d8tKKNHbwwbNmhUg2pi6bcBvA,489
-ararpy/smp/initial.py,sha256=VSNku2fYD1xGkpHxMqnSJCAhSQawfsDCdqYCxtDJryQ,17196
+ararpy/smp/initial.py,sha256=Wfjn9gyJyMSCRjPNIUhxDBw3b3_f-9Ui_iHAYkjFxWg,17332
 ararpy/smp/json.py,sha256=BTZCjVN0aj9epc700nwkYEYMKN2lHBYo-pLmtnz5oHY,2300
 ararpy/smp/plots.py,sha256=rF0vrFu9dMt2Eu1EHiDfDRC9232M6dH0Unc_3qNDxLY,33579
 ararpy/smp/raw.py,sha256=51n-rrbW2FqeZHQyevuG7iObPLGvIBzTe414QDVM1FE,6523
@@ -59,8 +59,8 @@ ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=Q97zfe2h2RaxADkoBAqd0uEiP16BFOajrTmXHMkL2EQ,25502
 ararpy/thermo/basic.py,sha256=nBGHI9uK7VdJwThwBIOcKAzdnYqPyQseFoY6s4zKizk,11504
-ararpy-0.1.27.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.1.27.dist-info/METADATA,sha256=ekOHHUdF4oyaBG5S7NJR7I4daFUFs-YzFCLo-Z3JXng,24516
-ararpy-0.1.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ararpy-0.1.27.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.1.27.dist-info/RECORD,,
+ararpy-0.1.28.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.1.28.dist-info/METADATA,sha256=DWqHjjrlOGBYz0bastBt3JX2UIxLvCp5HmvAu-MELRE,24516
+ararpy-0.1.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ararpy-0.1.28.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.1.28.dist-info/RECORD,,