ararpy 0.1.27__tar.gz → 0.1.28__tar.gz

{ararpy-0.1.27 → ararpy-0.1.28}/PKG-INFO

@@ -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 → ararpy-0.1.28}/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-0.1.27 → ararpy-0.1.28}/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 → ararpy-0.1.28}/ararpy.egg-info/PKG-INFO

@@ -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 → ararpy-0.1.28}/setup.py

@@ -16,7 +16,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setuptools.setup(
     name='ararpy',  #
-    version='0.1.27',  # version
+    version='0.1.28',  # version
     author='Yang Wu',
     author_email='wuycug@hotmail.com',
     description='A project for Ar-Ar geochronology',  # short description