ararpy 0.0.24__py3-none-any.whl → 0.1.1__py3-none-any.whl

ararpy/smp/sample.py

@@ -22,16 +22,22 @@ from types import MethodType
 import pandas as pd
 
 SAMPLE_INTERCEPT_HEADERS = [
-    'Sequence', '', '\u00B3\u2076Ar', '1\u03C3', '\u00B3\u2077Ar', '1\u03C3',
-    '\u00B3\u2078Ar', '1\u03C3', '\u00B3\u2079Ar', '1\u03C3', '\u2074\u2070Ar', '1\u03C3'
+    'Sequence', '',  # 0-1
+    '\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', '', '\u00B3\u2076Ar', '1\u03C3', '\u00B3\u2077Ar', '1\u03C3',
-    '\u00B3\u2078Ar', '1\u03C3', '\u00B3\u2079Ar', '1\u03C3', '\u2074\u2070Ar', '1\u03C3'
+    'Sequence', '',  # 0-1
+    '\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', '', '\u00B3\u2076Ar', '1\u03C3', '\u00B3\u2077Ar', '1\u03C3',
-    '\u00B3\u2078Ar', '1\u03C3', '\u00B3\u2079Ar', '1\u03C3', '\u2074\u2070Ar', '1\u03C3'
+    'Sequence', '',  # 0-1
+    '\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
@@ -42,16 +48,20 @@ DEGAS_HEADERS = [
     '\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'  # 29-32
+    '\u2074\u2070Ar[c]', '1\u03C3', '\u2074\u2070Ar[K]', '1\u03C3'  # 30-33
 ]
 PUBLISH_TABLE_HEADERS = [
-    'Sequence', '', '\u00B3\u2076Ar[a]', '\u00B3\u2077Ar[Ca]', '\u00B3\u2078Ar[Cl]',
-    '\u00B3\u2079Ar[K]', '\u2074\u2070Ar[r]', 'Apparent Age', '1\u03C3', '\u2074\u2070Arr%',
-    '\u00B3\u2079ArK%', 'Ca/K', '1\u03C3'
+    'Sequence', '',  # 0-1
+    '\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
+    'Ca/K', '1\u03C3',  # 11-12
 ]
 SPECTRUM_TABLE_HEADERS = [
-    'Sequence', '', '\u2074\u2070Ar/\u00B3\u2079Ar', '1\u03C3', 'Apparent Age',
-    '1\u03C3', '1\u03C3', '1\u03C3', '\u2074\u2070Ar[r]%', '\u00B3\u2079Ar[K]%'
+    'Sequence', '',  # 0-1
+    '\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
 ]
 ISOCHRON_TABLE_HEADERS = [
     'Sequence', '', 'Mark',  # 0-2
@@ -124,6 +134,9 @@ TOTAL_PARAMS_HEADERS = [
     'Isotopic Errors',  # 122
     'Parameter Errors',  # 123
     'Plot Errors',  # 124
+    'Heating Time (s)',  # 125
+    'Heating Actual Temp (C)',  # 126
+    'Heating AT 1\u03C3',  # 127
 ]
 
 SAMPLE_INTERCEPT_SHORT_HEADERS = [
@@ -229,6 +242,9 @@ TOTAL_PARAMS_SHORT_HEADERS = [
     'IsotopicErrors',  # 122
     'ParameterErrors',  # 123
     'PlotErrors',  # 124
+    'HeatingTime',  # 125
+    'HeatingActualTemp',  # 126
+    'HeatingActualTempError',  # 127
 ]
 
 DEFAULT_PLOT_STYLES = {
@@ -715,7 +731,7 @@ DEFAULT_PLOT_STYLES = {
     },
 }
 
-VERSION = '20231208'
+VERSION = '20240730'
 
 NAMED_DICT = {
     "unknown": {"header": SAMPLE_INTERCEPT_HEADERS.copy()},
@@ -815,7 +831,8 @@ class Sample:
         # 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 = '20231116'  # change smp parameters
+        self.__version = '20240730'  # change parameter table for thermo calculation
 
     @property
     def version(self):
@@ -859,7 +876,7 @@ class Sample:
 
     def set_selection(self): ...
 
-    def update_table(self): ...
+    def update_table(self, data: list, table_id: name): ...
 
     def unknown(self) -> ArArData: ...
 
@@ -901,6 +918,8 @@ class Sample:
 
     def set_info(self, info: dict): ...
 
+    def get_comp(self, name: str):...
+
     def to_pdf(self, file_path: str, figure: str = "figure_3"): ...
 
 
@@ -1031,19 +1050,12 @@ class Plot:
                 setattr(self, k, v)
 
 
-class Info:
-    def __init__(self, id='', name='', type='Info', **kwargs):
-        self.id = id
-        self.name = name
-        self.type = type
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-
 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,
-                 is_estimated=False, **kwargs):
+                 is_estimated=False, options=None, **kwargs):
+        if options is None:
+            options = {}
         self.index = index
         if name is None or not isinstance(name, str):
             name = ""
@@ -1065,6 +1077,8 @@ class Sequence:
         self.coefficients = coefficients
         self.fitting_method = fitting_method
         self.is_estimated = is_estimated
+        self.is_removed = False
+        self.options = options
 
         for k, v in kwargs.items():
             if hasattr(self, k) and type(getattr(self, k)) is MethodType:
@@ -1109,8 +1123,8 @@ class Sequence:
 
 
 class RawData:
-    def __init__(self, id='', name='', type='raw', data=None, sequence_num=0,
-                 isotopic_num=10, source=None, sequence=None, **kwargs):
+    def __init__(self, id='', name='', type='Unknown', data=None, sequence_num=0,
+                 isotopic_num=10, source=None, sequence=None, unit='fA', **kwargs):
         """
         Parameters
         ----------
@@ -1126,6 +1140,7 @@ class RawData:
         self.name = name
         self.type = type
         self.source = source
+        self.unit = unit
         self.isotopic_num = isotopic_num
         self.sequence_num = sequence_num
         self.interpolated_blank = None
@@ -1133,7 +1148,7 @@ class RawData:
             self.sequence: List[Sequence] = [
                 Sequence(index=index, 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=[0] * 5)
+                         fitting_method=[0] * 5, options=item[0][3])
                 for index, item in enumerate(data)]
         else:
             self.sequence: List[Sequence] = []

ararpy/smp/style.py

@@ -16,7 +16,6 @@ from .. import calc
 from . import (sample as samples, basic, initial, plots, )
 
 Sample = samples.Sample
-Info = samples.Info
 Table = samples.Table
 Plot = samples.Plot
 
@@ -49,8 +48,8 @@ def set_plot_style(smp: Sample):
     reset_plot_scale(smp)
     # Reset isochron data
     plots.reset_isochron_line_data(smp)
-    # Auto position of text
-    reset_text_position(smp)
+    # Auto position and contents of texts
+    reset_text(smp)
     # Set title, which are deleted in initializing
     suffix = f"{smp.Info.sample.name} {smp.Info.sample.material}"
     for figure_id, figure in basic.get_components(smp).items():
@@ -142,7 +141,7 @@ def reset_plot_scale(smp: Sample, only_figure: str = None):
             return xscale, yscale
 
 
-def reset_text_position(smp: Sample, only_figure: str = None):
+def reset_text(smp: Sample, only_figure: str = None):
     """
     Reset text position to default, if only figure is defined, only this figure will be reset.
     Parameters
@@ -161,9 +160,11 @@ def reset_text_position(smp: Sample, only_figure: str = None):
         text_1 = basic.get_plot_set(figure, 'Text for Set 1')
         if text_1 is not None:
             setattr(text_1, 'pos', [20, 40])
+            setattr(text_1, 'text', "")
         text_2 = basic.get_plot_set(figure, 'Text for Set 2')
         if text_2 is not None:
             setattr(text_2, 'pos', [70, 40])
+            setattr(text_2, 'text', "")
 
 
 # =======================

ararpy/smp/table.py

@@ -85,52 +85,103 @@ def update_handsontable(smp: Sample, data: list, id: str):
 
     def _strToBool(cols):
         bools_dict = {
-            'true': True, 'false': False, '1': True, '0': False, 'none': False,
+            'true': True, 'false': False, 'True': True, 'False': False, '1': True, '0': False, 'none': False,
         }
         return [bools_dict.get(str(col).lower(), False) for col in cols]
     try:
         smp.SequenceName = data[0]
     except IndexError:
         pass
+
+    update_all_table = False
     try:
-        smp.SequenceValue = data[1]
+        if data[1] != smp.SequenceValue:
+            smp.SequenceValue = data[1]
     except IndexError:
         pass
+    else:
+        update_all_table = True
+
     if id == '1':  # 样品值
-        data = _normalize_data(data, 12, 2)
+        data = _normalize_data(data, len(samples.SAMPLE_INTERCEPT_HEADERS), 2)
         smp.SampleIntercept = data
     elif id == '2':  # 本底值
-        data = _normalize_data(data, 12, 2)
+        data = _normalize_data(data, len(samples.BLANK_INTERCEPT_HEADERS), 2)
         smp.BlankIntercept = data
     elif id == '3':  # 校正值
-        data = _normalize_data(data, 12, 2)
+        data = _normalize_data(data, len(samples.CORRECTED_HEADERS), 2)
         smp.CorrectedValues = data
-    elif id == '4':  #
-        data = _normalize_data(data, 34, 2)
+    elif id == '4':  # Degas table
+        data = _normalize_data(data, len(samples.DEGAS_HEADERS), 2)
         smp.DegasValues = data
     elif id == '5':  # 发行表
-        data = _normalize_data(data, 13, 2)
+        data = _normalize_data(data, len(samples.PUBLISH_TABLE_HEADERS), 2)
         smp.PublishValues = data
     elif id == '6':  # 年龄谱
-        data = _normalize_data(data, 10, 2)
+        data = _normalize_data(data, len(samples.SPECTRUM_TABLE_HEADERS), 2)
         smp.ApparentAgeValues = data
     elif id == '7':  # 等时线
         smp.IsochronMark = data[2]
-        data = _normalize_data(data, 42, 3)
+        data = _normalize_data(data, len(samples.ISOCHRON_TABLE_HEADERS), 3)
         smp.IsochronValues = data
         smp.SelectedSequence1 = [
-            i for i in range(len(smp.IsochronMark)) if smp.IsochronMark[i] == 1]
+            i for i in range(len(smp.IsochronMark)) if str(smp.IsochronMark[i]) == "1"]
         smp.SelectedSequence2 = [
-            i for i in range(len(smp.IsochronMark)) if smp.IsochronMark[i] == 2]
+            i for i in range(len(smp.IsochronMark)) if str(smp.IsochronMark[i]) == "2"]
         smp.UnselectedSequence = [
             i for i in range(len(smp.IsochronMark)) if
             i not in smp.SelectedSequence1 + smp.SelectedSequence2]
+        #
+        smp.Info.results.selection[0]['data'] = smp.SelectedSequence1
+        smp.Info.results.selection[1]['data'] = smp.SelectedSequence2
+        smp.Info.results.selection[2]['data'] = smp.UnselectedSequence
     elif id == '8':  # 总参数
-        data = _normalize_data(data, 125, 2)
-        data[103: 115] = [_strToBool(i) for i in data[103: 115]]
+        data = _normalize_data(data, len(samples.TOTAL_PARAMS_HEADERS), 2)
+        data[101: 112] = [_strToBool(i) for i in data[101: 112]]
         smp.TotalParam = data
     else:
         raise ValueError(f"{id = }, The table id is not supported.")
-    update_table_data(smp, only_table=id)  # Update data of tables after changes of a table
+    if update_all_table:
+        update_table_data(smp)
+    else:
+        update_table_data(smp, only_table=id)  # Update data of tables after changes of a table
+
+
+def update_data_from_table(smp: Sample, only_table: str = None):
+    """
+    Update table data
+    Parameters
+    ----------
+    smp
+    only_table
+
+    Returns
+    -------
+
+    """
+    for key, comp in basic.get_components(smp).items():
+        if not isinstance(comp, Table):
+            continue
+        if only_table is not None and key != only_table:
+            continue
+        if key == '1':
+            smp.SampleIntercept = calc.arr.transpose(comp.data)[2:]
+        elif key == '2':
+            smp.BlankIntercept = calc.arr.transpose(comp.data)[2:]
+        elif key == '3':
+            smp.CorrectedValues = calc.arr.transpose(comp.data)[2:]
+        elif key == '4':
+            smp.DegasValues = calc.arr.transpose(comp.data)[2:]
+        elif key == '5':
+            smp.PublishValues = calc.arr.transpose(comp.data)[2:]
+        elif key == '6':
+            smp.ApparentAgeValues = calc.arr.transpose(comp.data)[2:]
+        elif key == '7':
+            smp.IsochronValues = calc.arr.transpose(comp.data)[3:]
+        elif key == '8':
+            smp.TotalParam = calc.arr.transpose(comp.data)[2:]
+        else:
+            pass
+
 
 

ararpy/test.py

@@ -10,26 +10,287 @@
 """
 import ararpy as ap
 import os
+import ctypes
+import numpy as np
+import time
+
+def is_number(s):
+    try:
+        float(s)
+        return True
+    except ValueError:
+        return False
+
+
+class DiffSample:
+    def __init__(self, smp = None, name: str = None):
+
+        if smp is not None:
+            self.smp = smp
+            self.sname = self.smp.name()
+
+            self.sequence = self.smp.sequence()
+            self.ni = self.sequence.size  # sequence number
+
+            # self.telab = np.linspace(600, 1500, self.ni, dtype=np.float64)
+            self.telab = np.array(self.smp.TotalParam[124], dtype=np.float64)
+
+            ### 这里用真实的加热温度之后 a1 > 0，导致后面无法计算
+            ### 原因：telab不能为 0
+
+
+            self.telab = self.telab + 275.13
+            # self.tilab = np.array([15*60 for i in range(self.ni)], dtype=np.float64)
+            self.tilab = np.array(self.smp.TotalParam[123], dtype=np.float64)
+            self.a39 = np.array(self.smp.DegasValues[20], dtype=np.float64)
+            self.sig39 = np.array(self.smp.DegasValues[21], dtype=np.float64)
+            self.f = np.cumsum(self.a39) / self.a39.sum()
+            self.f[-1] = 0.999999999
+            # self.f = np.insert(self.f, 0, 0)
+            self.ya = np.array(self.smp.ApparentAgeValues[2], dtype=np.float64)
+            self.sig = np.array(self.smp.ApparentAgeValues[3], dtype=np.float64)
+
+            loc = "D:\\PythonProjects\\ararpy_package\\ararpy\\examples"
+            self.file_age_in = open(os.path.join(loc, f"{self.sname}_age.in"), "w")
+            self.file_sig_in = open(os.path.join(loc, f"{self.sname}_sig.in"), "w")
+            self.file_tmp_in = open(os.path.join(loc, f"{self.sname}_tmp.in"), "w")
+            self.file_fj_in = open(os.path.join(loc, f"{self.sname}_fj.in"), "w")
+            self.file_a39_in = open(os.path.join(loc, f"{self.sname}_a39.in"), "w")
+
+            self.file_age_in.writelines("\n".join([f"  {self.f[i] * 100}  {self.ya[i]}" for i in range(self.ni)]))
+            self.file_sig_in.writelines("\n".join([f"{self.sig[i]}" for i in range(self.ni)]))
+            self.file_tmp_in.writelines(f"{str(self.ni)}\n")
+            self.file_tmp_in.writelines("\n".join([f"{self.telab[i]}\n{self.tilab[i]}" for i in range(self.ni)]))
+            self.file_fj_in.writelines("\n".join([f"{self.f[i]}" for i in range(self.ni)]))
+            self.file_a39_in.writelines("\n".join([f"  {self.a39[i]}  {self.sig39[i]}" for i in range(self.ni)]))
+
+            self.file_age_in.close()
+            self.file_sig_in.close()
+            self.file_tmp_in.close()
+            self.file_fj_in.close()
+            self.file_a39_in.close()
+
+
+        elif name is not None:
+            self.sname = name
+        else:
+            raise ValueError("Sample not found")
+
+        self.pi = 3.141592654
+        self.nloop = 1
+        self.ngauss = 10
+        self.zi = [0.]
+        self.b = 8
+        self.imp = 2
+        self.acut = 0.5
+        self.dchmin = 0.01
+        self.ncons = 0
+        self.ndom = 8
+        self.mdom = 8
+        self.iset = 0
+        self.gset = 0
+        self.wt = []
+
+
+class DiffAgemonFuncs(DiffSample):
+
+    def __init__(self, ni=10, mmax=100, ochisq=0, **kwargs):
+
+        self.ni = ni
+        self.mmax = mmax
+        self.ochisq = ochisq
+
+        super().__init__(**kwargs)
+
+        self.nca = 200
+        self.da = np.zeros(self.ni, dtype=np.float64)
+        self.beta = np.zeros(self.mmax, dtype=np.float64)
+        self.atry = np.zeros(self.mmax, dtype=np.float64)
+
+        # constants
+        self.nwcy = 10
+        self.ncyc = 1
+        self.ntst = 1001
+        self.ns = 200
+        self.nmaxi = np.zeros(self.nwcy, dtype=int)
+        self.nmaxo = np.zeros(self.nwcy, dtype=int)
+        self.tti = np.zeros([self.nwcy, 2, self.ntst], dtype=np.float64)
+        self.tto = np.zeros([self.nwcy, 2, self.ntst], dtype=np.float64)
+        self.agei = np.zeros([self.nwcy, 2, self.ns], dtype=np.float64)
+        self.ageo = np.zeros([self.nwcy, 2, self.ns], dtype=np.float64)
+
+        self.loc = "D:\\PythonProjects\\ararpy_package\\ararpy\\examples"
+
+        self.file_ame_in = open(os.path.join(self.loc, f"{self.sname}.ame"), "r")  # from arrmulti
+        self.file_age_in = open(os.path.join(self.loc, f"{self.sname}_age.in"), "r")
+        self.file_sig_in = open(os.path.join(self.loc, f"{self.sname}_sig.in"), "r")
+        self.file_tmp_in = open(os.path.join(self.loc, f"{self.sname}_tmp.in"), "r")
+
+        self.file_output_mch = open(os.path.join(self.loc, f"{self.sname}_mch-out.dat"), "w")
+        self.file_output_mages = open(os.path.join(self.loc, f"{self.sname}_mages-out.dat"), "w")
+        self.file_output_agesd = open(os.path.join(self.loc, f"{self.sname}_ages-sd.samp"), "w")
+
+        self.file_output_mch.close()
+        self.file_output_mages.close()
+        self.file_output_agesd.close()
+
+        # parameters
+        self.ns = 200
+        self.nc = 100
+        self.ntst = 1001
+        self.mxi = 350
+        self.nn = 319
+        self.mfit = 10
+        self.nwcy = 10
+        self.nd = 10
+        self.xlambd = 0.0005543
+        self.a = 0
+        self.perc = 0.01
+        self.cht0 = 1.0e-4
+        self.nrun = 5
+        self.maxrun = 15
+        self.nemax = 10
+
+        # 读取加热温度和时间
+        self.ni = int(self.file_tmp_in.readline())
+        self.nit = self.ni
+        self.r39 = np.zeros(self.ni, dtype=np.float64)
+        self.telab = np.zeros(self.ni, dtype=np.float64)
+        self.tilab = np.zeros(self.ni, dtype=np.float64)
+        for i in range(self.ni):
+            self.telab[i] = float(self.file_tmp_in.readline())
+            self.tilab[i] = float(self.file_tmp_in.readline())
+            if self.telab[i] > 1373:
+                # go to 11
+                self.ni = i
+                break
+            self.tilab[i] /= 5.256E+11  # 1 Ma = 525600000000 minutes
+
+        # 读取
+        nemax = 0
+        self.nst_arr = np.zeros(100, dtype=int)
+        self.e_arr = np.zeros(100, dtype=np.float64)
+        self.d0_arr = np.zeros([100, 20], dtype=np.float64)
+        self.vc_arr = np.zeros([100, 20], dtype=np.float64)
+        self.e = 0
+        self.d0 = np.zeros(self.nd, dtype=np.float64)
+        self.vc = np.zeros(self.nd, dtype=np.float64)
+        kk = 0
+        while True:
+            try:
+                self.nst_arr[kk] = int(self.file_ame_in.readline())  # sequence number
+                # self.nst = int(self.file_ame_in.readline())  # sequence number
+                for i in range(self.nst_arr[kk]):
+                    self.e_arr[kk] = float(self.file_ame_in.readline())
+                    self.d0_arr[kk, i] = 10 ** float(self.file_ame_in.readline()) / 4 * (24 * 3600 * 365e+6)
+                    self.vc_arr[kk, i] = float(self.file_ame_in.readline())
+                    # self.e = float(self.file_ame_in.readline())
+                    # self.d0[i] = float(self.file_ame_in.readline())
+                    # self.vc[i] = float(self.file_ame_in.readline())
+                    # self.d0[i] = 10 ** self.d0[i] / 4 * (24 * 3600 * 365e+6)
+                    nemax += 1
+                self.atmp = self.file_ame_in.readline()
+                self.atmp = self.file_ame_in.readline()
+                self.atmp = self.file_ame_in.readline()
+                kk += 1
+            except ValueError:
+                break
+        self.kk = kk
+        print(f"{self.kk = }")
+
+        # 读取sig
+        self.sig = np.zeros(self.ns, dtype=np.float64)
+        self.xs = np.zeros(self.ns + 1, dtype=np.float64)
+        self.ya = np.zeros(self.ns + 1, dtype=np.float64)
+        for i in range(self.nit + 1):
+            try:
+                self.sig[i] = float(self.file_sig_in.readline())
+                if self.sig[i] <= 0:
+                    raise ValueError("Sigma less than 0")
+                self.xs[i + 1], self.ya[i + 1] = [float(j) for j in filter(lambda x: is_number(x),
+                                                                           self.file_age_in.readline().split(' '))]
+                self.xs[i + 1] /= 100
+                if self.ya[i] < 0:
+                    self.ya[i] = 0
+            except ValueError:
+                print(f"{i = } error in reading sig file")
+            continue
+
+        self.max_plateau_age = 30
+
+        self.file_ame_in.close()
+        self.file_tmp_in.close()
+        self.file_age_in.close()
+        self.file_sig_in.close()
+
+
+
+
 
 
 def test():
     example_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), r'examples')
     print(f"Running: ararpy.test()")
     print(f"============= Open an example .arr file =============")
-    file_path = os.path.join(example_dir, r'22WHA0433.arr')
-    sample = ap.from_arr(file_path=file_path)
-    # file_path = os.path.join(example_dir, r'22WHA0433.age')
-    # sample = ap.from_age(file_path=file_path)
-    print(f"{file_path = }")
-    print(f"sample = from_arr(file_path=file_path)")
-    print(f"{sample.name() = }")
-    print(f"{sample.help = }")
-    print(f"sample.parameters() = {sample.parameters()}")
-    print(f"sample.parameters().to_df() = \n{sample.parameters().to_df()}")
-    print(sample.show_data())
-    print(sample.sample())
-    print(sample.blank().to_df().iloc[:, [1, 2, 3]])
+    # file_path = os.path.join(example_dir, r'22WHA0433.arr')
+    # sample = ap.from_arr(file_path=file_path)
+    # # file_path = os.path.join(example_dir, r'22WHA0433.age')
+    # # sample = ap.from_age(file_path=file_path)
+    # print(f"{file_path = }")
+    # print(f"sample = from_arr(file_path=file_path)")
+    # print(f"{sample.name() = }")
+    # print(f"{sample.help = }")
+    # print(f"sample.parameters() = {sample.parameters()}")
+    # print(f"sample.parameters().to_df() = \n{sample.parameters().to_df()}")
+    # print(sample.show_data())
+    # print(sample.sample())
+    # print(sample.blank().to_df().iloc[:, [1, 2, 3]])
+
+    # diff_smp = ap.calc.diffusion_funcs.DiffArrmultiFunc(smp=sample)
+    # diff_smp = ap.calc.diffusion_funcs.DiffArrmultiFunc(name='12h')
+    # e, sige, ordi, sigo = diff_smp.main()
+    # diff_smp = ap.calc.diffusion_funcs.DiffAgemonFuncs(smp=sample)
+    # diff_smp = ap.calc.diffusion_funcs.DiffAgemonFuncs(name='12h')
+    # diff_smp.main()
+    # diff_smp = ap.calc.diffusion_funcs.DiffDraw(name='12h')
+    # diff_smp.main()
+
+
+    # diff_smp = ap.calc.diffusion_funcs.InsideTemperatureCalibration()
+    #
+    # # k1, k2 = diff_smp.get_calibrated_temp(45 * 60, 600)
+    # # print(round((k1 + k2) / 2, 2), round(abs(k2 - k1) / 2, 2))
+    #
+    # ## 显示每个设定温度的所有空载加热测试结果，红蓝线为上下95%置信区间
+    # diff_smp.plot()
+    #
+    # ## 显示用于校正的温度曲线
+    # diff_smp.plot_confidence()
+
+    ## 显示实际样品的 libano 记录，并给出校正的温度曲线
+    # diff_smp.plot_libano_log(r"C:\Users\Young\OneDrive\Documents\Libano Data\2024-03-26\202403260941-libano.log")
+    # diff_smp.plot_libano_log(r"C:\Users\Young\OneDrive\00-Projects\【2】个人项目\2022-05论文课题\【3】分析测试\ArAr\01-VU实验数据和记录\20240717-Y53\202407171832-libano.log")
+    # diff_smp.plot_libano_log(r"C:\Users\Young\OneDrive\00-Projects\【2】个人项目\2022-05论文课题\【3】分析测试\ArAr\01-VU实验数据和记录\20240714-Y52\202407142127-libano.log")
+
+    name = "20240909-Y86"
+    arr_name = "20240909_24BY86"
+
+    libano_log_path = f"C:\\Users\\Young\\OneDrive\\00-Projects\\【2】个人项目\\2022-05论文课题\\【3】分析测试\\ArAr\\01-VU实验数据和记录\\{name}\\Libano-log"
+    # libano_log_path = r"C:\Users\Young\OneDrive\00-Projects\【2】个人项目\2022-05论文课题\【3】分析测试\ArAr\01-VU实验数据和记录\20240705-Y50\Libano-log"
+    libano_log_path = [os.path.join(libano_log_path, i) for i in os.listdir(libano_log_path)]
+    print(libano_log_path)
+    helix_log_path = f"C:\\Users\\Young\\OneDrive\\00-Projects\\【2】个人项目\\2022-05论文课题\\【3】分析测试\\ArAr\\01-VU实验数据和记录\\{name}\\LogFiles"
+    # helix_log_path = r"C:\Users\Young\OneDrive\00-Projects\【2】个人项目\2022-05论文课题\【3】分析测试\ArAr\01-VU实验数据和记录\20240621-Y56\LogFiles-20240621"
+    helix_log_path = [os.path.join(helix_log_path, i) for i in os.listdir(helix_log_path)]
+    print(helix_log_path)
+
+    loc = f"C:\\Users\\Young\\OneDrive\\00-Projects\\【2】个人项目\\2022-05论文课题\\【3】分析测试\\ArAr\\01-VU实验数据和记录\\{name}"
+    arr_path = f"C:\\Users\\Young\\OneDrive\\00-Projects\\【2】个人项目\\2022-05论文课题\\【3】分析测试\\ArAr\\01-VU实验数据和记录\\Arr Data\\{arr_name}.arr"
+    diff_smp = ap.calc.diffusion_funcs.SmpTemperatureCalibration(libano_log_path=libano_log_path, helix_log_path=helix_log_path, arr_path=arr_path, loc=loc)
+
+
 
+###  梳理这些函数  用numba加速
 
 if __name__ == "__main__":
     test()

{ararpy-0.0.24.dist-info → ararpy-0.1.1.dist-info}/METADATA

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