ararpy 0.1.33__py3-none-any.whl → 0.1.34__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. ararpy/__init__.py +2 -2
  2. ararpy/calc/plot.py +1 -2
  3. ararpy/files/calc_file.py +6 -6
  4. ararpy/smp/plots.py +3 -3
  5. {ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/METADATA +1 -1
  6. {ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/RECORD +9 -9
  7. {ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/WHEEL +0 -0
  8. {ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/licenses/LICENSE +0 -0
  9. {ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/top_level.txt +0 -0
ararpy/__init__.py CHANGED
@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
16
16
  """ Information """
17
17
 
18
18
  name = 'ararpy'
19
- version = '0.1.33'
19
+ version = '0.1.34'
20
20
  __version__ = version
21
21
  full_version = version
22
- last_update = '2025-10-01'
22
+ last_update = '2025-10-22'
23
23
 
24
24
  """ ArArPy Functions """
25
25
 
ararpy/calc/plot.py CHANGED
@@ -53,9 +53,8 @@ def get_axis_scale(data: list, count=6, increment=None, extra_count=0, min_inter
53
53
  str(decimal.Decimal(int(interval / mag // min_interval) + min_interval) * decimal.Decimal(str(mag))))
54
54
  else:
55
55
  increment = decimal.Decimal(increment)
56
- start = decimal.Decimal(0)
56
+ start = decimal.Decimal(_min) // increment * increment
57
57
  if _min < 0:
58
- start = -increment
59
58
  while start > _min:
60
59
  start -= increment
61
60
  else:
ararpy/files/calc_file.py CHANGED
@@ -291,8 +291,8 @@ def open_240(data: pd.DataFrame, logs01: pd.DataFrame, logs02: pd.DataFrame):
291
291
  -999, -999, -999, -999, -999, -999, -999, -999,
292
292
  # 123-130
293
293
  -999, -999, -999, -999, -999, -999, -999, -999,
294
- # 131-135
295
- -999, -999, -999, -999, -999,
294
+ # 131-137
295
+ -999, -999, -999, -999, -999, -999, -999,
296
296
  ]
297
297
 
298
298
  # double transpose to remove keys
@@ -591,9 +591,9 @@ class ArArCalcFile:
591
591
  book_contents = read_calc_file(self.file_path)
592
592
  # create data frames for book values
593
593
  content = pd.DataFrame(book_contents['Data Tables'])
594
- logs01 = pd.DataFrame(book_contents['Logs01'])
595
- logs02 = pd.DataFrame(book_contents['Logs02'])
596
- logs03 = pd.DataFrame(book_contents['Logs03'])
594
+ logs01 = pd.DataFrame(book_contents.get('Logs01', [[]]))
595
+ logs02 = pd.DataFrame(book_contents.get('Logs02', [[]]))
596
+ logs03 = pd.DataFrame(book_contents.get('Logs03', [[]]))
597
597
 
598
598
  start_row = 5
599
599
  sequence_num = int(logs03[2][0])
@@ -613,7 +613,7 @@ class ArArCalcFile:
613
613
  material = data[46][0]
614
614
  analyst = data[48][0]
615
615
  else:
616
- raise ValueError(f'non-supported version: {version}')
616
+ raise ValueError(f'Unsupported version: {version}')
617
617
 
618
618
  # change error type, 2sigma to 1sigma..., relative errors to absolute errors
619
619
  data = change_error_type(data, header)
ararpy/smp/plots.py CHANGED
@@ -247,10 +247,10 @@ def get_isochron_results(data: list, smp: Sample, sequence, figure_type: int = 0
247
247
 
248
248
  if len(sequence) < 3:
249
249
  return iso_res
250
- regression_method = {
251
- "york-2": calc.regression.york2, "olst": calc.regression.olst
252
- }.get(smp.TotalParam[97][min(sequence)].lower(), calc.regression.york2)
253
250
  try:
251
+ regression_method = {
252
+ "york-2": calc.regression.york2, "olst": calc.regression.olst
253
+ }.get(smp.TotalParam[97][min(sequence)].lower(), calc.regression.york2)
254
254
  regression_res = regression_method(*data[:5])
255
255
  except (Exception, BaseException):
256
256
  # print(f"Warning: {traceback.format_exc()}")
{ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ararpy
3
- Version: 0.1.33
3
+ Version: 0.1.34
4
4
  Summary: A project for Ar-Ar geochronology
5
5
  Home-page: https://github.com/wuyangchn/ararpy.git
6
6
  Author: Yang Wu
{ararpy-0.1.33.dist-info → ararpy-0.1.34.dist-info}/RECORD RENAMED
@@ -5,7 +5,7 @@ ararpy/Example - Show MDD results.py,sha256=YFkiQual60lyCClsfvivr4REY6waSYuomf0u
5
5
  ararpy/Example - Show all Kfs age spectra.py,sha256=1edPtBpFfS0lC7vLnLu34mDHt_xjbc8ptk6rZ--pf-I,12304
6
6
  ararpy/Example - Show random walk results.py,sha256=8WWvbAI7ySiMR-XwtFe5kTQihW3mcqzL3S7EUZdoxYo,15477
7
7
  ararpy/Example - Tc calculation.py,sha256=sD9pu3IaZ8mBV95rV2wOEhlQUexFNqBUoBqnNMdUBis,19617
8
- ararpy/__init__.py,sha256=gPUEjLwZfmGeG3RpVZntFrR9QpnFevpxiyACtYq_gtk,6857
8
+ ararpy/__init__.py,sha256=lBvc-oTc0Js1bMrGGgXnmSRTJPqkJrqa-vOWCawlPXE,6857
9
9
  ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
10
10
  ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
11
11
  ararpy/calc/age.py,sha256=WOZs70zXiBWDIEhXJLIaNiYTOFJNk0NDbH5e5zCbCks,5435
@@ -16,7 +16,7 @@ ararpy/calc/err.py,sha256=63LtprqjemlIb1QGDst4Ggcv5KMSDHdlAIL-nyQs1eA,2691
16
16
  ararpy/calc/histogram.py,sha256=0GVbDdsjd91KQ1sa2B7NtZ4KGo0XpRIJapgIrzAwQUo,5777
17
17
  ararpy/calc/isochron.py,sha256=ej9G2e68k6yszonWHsLcEubh3TA7eh1upTJP_X0ttAA,5726
18
18
  ararpy/calc/jvalue.py,sha256=OL5zPYU8Pac-wOxUWPCgu3onh2n01xDnhpi2mlUsjJM,1146
19
- ararpy/calc/plot.py,sha256=sUqjKBdAEjFarUoSCLqf8cbUM0rEAdZhmtyXB2K7LkA,2139
19
+ ararpy/calc/plot.py,sha256=Hdtb-q18xYC8ZJeDKGRauCSbj4_7e6Z8HQs9aYgfvao,2139
20
20
  ararpy/calc/raw_funcs.py,sha256=GJ0VW0sc2qPIVp5jSDmPP1ClOoYRa_cc35ye7QDYOiI,2744
21
21
  ararpy/calc/regression.py,sha256=lWMoZkovtj5OEYM8eT0FcMsGrDIkKm9rsG45ru3IVuk,39798
22
22
  ararpy/calc/spectra.py,sha256=_Q23eP9necHlaCoHf3_UfW1N3JmVZj5rcWFro8GS-CA,1995
@@ -42,7 +42,7 @@ ararpy/examples/sample-default.smp,sha256=YNkoQGgPrsL_fXS7ZHxfRtLQWekCDqT9czS6vB
42
42
  ararpy/files/__init__.py,sha256=l5B5ZQ01WdtvjjN0aMkyAFNgpwANdM_1I0tQbqnRuEY,69
43
43
  ararpy/files/arr_file.py,sha256=pD5MxkAydL7cNq2wmKFUaOU4jHhc3MzTYrwbxZ3f46w,881
44
44
  ararpy/files/basic.py,sha256=mGYP7QJBtyasVAYcwT0a9k6tPlcStxASddgzbaxYKkE,2105
45
- ararpy/files/calc_file.py,sha256=wbt-cQhPnFJ32QyofXvjCPPehmWSj4CHnidkrP7dFgk,28694
45
+ ararpy/files/calc_file.py,sha256=RrfMo7Q8-4pBMQdpGY0guF52aSqAk8LEjq2NE3toL2w,28734
46
46
  ararpy/files/new_file.py,sha256=efblARIBROVLWS2w3-98BxLX5VZ8grRpiTkJFtf_rAk,214
47
47
  ararpy/files/raw_file.py,sha256=3vGinbUyTWyQ57jMFIuckrPkN0TrNe1hqKCOAWaj70A,21854
48
48
  ararpy/files/xls.py,sha256=DVcZ_yRnc19p-m4leGGjt-YPDpSa2udYKmGyrM0qub0,640
@@ -57,7 +57,7 @@ ararpy/smp/export.py,sha256=mWnnNg7DYIxcxyqeGXAWUS7faJmO7UHwnMVPX33_aLg,120638
57
57
  ararpy/smp/info.py,sha256=iKUELm-BuUduDlJKC1d8tKKNHbwwbNmhUg2pi6bcBvA,489
58
58
  ararpy/smp/initial.py,sha256=QGk7vh7JyVqalwnpd9VudQoX2Z9tyWzfIIw_cL5Sok0,18031
59
59
  ararpy/smp/json.py,sha256=BTZCjVN0aj9epc700nwkYEYMKN2lHBYo-pLmtnz5oHY,2300
60
- ararpy/smp/plots.py,sha256=S4TjYbR9BVxMh4pTSTYvhS-rdCz5zXg2wxdFgQlXT28,33582
60
+ ararpy/smp/plots.py,sha256=fFuJxoFcnvGSysjdEdrbW_ITpukt0iGs2K25gshIKNU,33594
61
61
  ararpy/smp/raw.py,sha256=51n-rrbW2FqeZHQyevuG7iObPLGvIBzTe414QDVM1FE,6523
62
62
  ararpy/smp/sample.py,sha256=iaFjG0S0GuNwbLeUFpzEFIbqa0oX0KekRZuLJd2mSCQ,58903
63
63
  ararpy/smp/style.py,sha256=Q8f6SsqnxmzocxpZUyGDiNanVW0ijCZpxHKh19UIeoM,7800
@@ -66,8 +66,8 @@ ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
66
66
  ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
67
67
  ararpy/thermo/atomic_level_random_walk.py,sha256=ncw9DtxRfS6zlQbLVLNX7WNoO9sX_nSomwAsTH0_O3k,25910
68
68
  ararpy/thermo/basic.py,sha256=JJRZbYmvXlpRAV2FeFPwLhrig4ZhNQmJnWqgOjo-1YQ,11508
69
- ararpy-0.1.33.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
70
- ararpy-0.1.33.dist-info/METADATA,sha256=pr2__kQa2tcCCieNzCLX58QgKwXWD-ur1uKfM5N47JQ,24516
71
- ararpy-0.1.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
72
- ararpy-0.1.33.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
73
- ararpy-0.1.33.dist-info/RECORD,,
69
+ ararpy-0.1.34.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
70
+ ararpy-0.1.34.dist-info/METADATA,sha256=ZOHvn2PDOQXK_B4Dy0XlzzY0KoxaXraCH-I8u67YQmM,24516
71
+ ararpy-0.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
72
+ ararpy-0.1.34.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
73
+ ararpy-0.1.34.dist-info/RECORD,,