TDCRPy 1.9.7__py3-none-any.whl → 1.9.9__py3-none-any.whl

{TDCRPy-1.9.7.dist-info → TDCRPy-1.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 1.9.7
+Version: 1.9.9
 Summary: TDCR model
 Home-page: https://pypi.org/project/TDCRPy/
 Author: RomainCoulon (Romain Coulon)

{TDCRPy-1.9.7.dist-info → TDCRPy-1.9.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=-eWgvVpjIOX2wb1ajxXTyD3GRBdaZw7J5Mce5YuJWs0,53857
+tdcrpy/TDCRPy.py,sha256=kl0UM0HEY7D95M1c806IkYkXl7du1BMtWUA7jTiOGVs,53859
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=VEkf1IFDXgwvt9OXmKd3blr465uNmXd84HSYeIoew7E,104713
+tdcrpy/TDCR_model_lib.py,sha256=_UlE_899c6jFgZoV4uZb-0iKTL9GraS_wvBnTxlJp0g,104784
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
 tdcrpy/config.toml,sha256=rHuuM520HZquGrEd8LAVUdvnzZGtk90pigudy-MXnm8,1389
@@ -1068,7 +1068,7 @@ tdcrpy/Quenching/TandataUG.txt,sha256=AkUGz2dAZ6g3bQIIacR5f92aa8gmiklgRbN4Dyz-12
 tdcrpy/Quenching/alpha_toulene.txt,sha256=rJB9xCLM3GLg91EKfhu8sGwro281ySq6R0G5mXMt3f8,1553
 tdcrpy/Quenching/inputVecteurAlpha.txt,sha256=ee4emplX51vhomC7cGNP_eE5eqS9By5PaSSaa4hh1eg,178652
 tdcrpy/Quenching/inputVecteurElectron.txt,sha256=5NBRBaiB7op1SJ6v952w9gFKqh0x83pn8zYcoUpy33Y,181498
-tdcrpy/decayData/All-nuclides_BetaShape.zip,sha256=JfbU66QYnYIki7nmwbXBnf7MDOa7JDBqFv4hEsEQQyM,7130930
+tdcrpy/decayData/All-nuclides_BetaShape.zip,sha256=-qTbYuzgTJv9AyJ2x5zX-9ndWBY3SuNyS2LBDP5iSwg,7633072
 tdcrpy/decayData/All-nuclides_Ensdf.zip,sha256=GL-X_IG6x4ykGrWYaMiZrjfMXOvYPM07G-Cp8WCPOu8,437902
 tdcrpy/decayData/All-nuclides_PenNuc.zip,sha256=DmhS2CYegWhL8qggc_MO6FgyiXE5qX73dOoH-SSQXoo,388954
 tdcrpy/decayData/atom-ENDF-VII0.zip,sha256=oP4Z7qWweWF4j12QAIfvLFLlqeY1RomXwXD2iFgQCqo,1624444
@@ -1080,8 +1080,8 @@ tdcrpy/docs/_build/html/source/modules.html,sha256=Jf-qxVBId0UgpwyvYuyjtMNG-ezPO
 tdcrpy/docs/_build/html/source/tdcrpy.html,sha256=-38lHMNFB22p1tWJEeN3yDqfDiCYE304vxDamO1-iRc,3779
 tdcrpy/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tdcrpy/test/test_tdcrpy.py,sha256=MTMiE0N7RiyE8Rom2Yu8kCDR03pJga9D6_o7wr7leVA,4675
-TDCRPy-1.9.7.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.9.7.dist-info/METADATA,sha256=OKEV_V5X9_sI7WYyLeCts6t2diuvXM-L68-BZMHJFg8,15995
-TDCRPy-1.9.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-TDCRPy-1.9.7.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.9.7.dist-info/RECORD,,
+TDCRPy-1.9.9.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.9.9.dist-info/METADATA,sha256=P7afUBbL_j4ZV3hKPN0ZqAkyVLC4BWu1ISCRdBSnI-s,15995
+TDCRPy-1.9.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+TDCRPy-1.9.9.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.9.9.dist-info/RECORD,,

tdcrpy/TDCRPy.py

@@ -179,7 +179,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
         if mode == "eff":
             return out[0], 0, out[1], 0, out[2], 0
     elif (not Smodel) and (not Rad in radListPureBeta):
-        print("cannot be processed by the analytical model.")
+        # print("cannot be processed by the analytical model.")
         # print(f"Analytical model used for {Rad}")
         out=tl.modelAnalytical(L,TD,TAB,TBC,TAC,Rad,kB,V,mode,mode2,1000)
         if mode == "res":

tdcrpy/TDCR_model_lib.py

@@ -18,12 +18,11 @@ import pkg_resources
 import configparser
 import numpy as np
 import zipfile as zf
-import time
 import re
 import os
 import scipy.interpolate as  interp
 import matplotlib.pyplot as plt
-import toml
+from tqdm import tqdm
 
 """
 ======= Import ressource data =======
@@ -824,7 +823,7 @@ def readBetaShape(rad,mode,level,z=z_betashape):
         else:
             p.append(p0 * (e[k]-e[k-1]))
 
-    e=(np.asarray(e[:-1])+np.asarray(e[1:]))/2
+    e=(np.asarray(e[:-1])+np.asarray(e[1:]))/2 # deal with the continuity hypothesis
     p.pop(-1)
     p /= sum(np.asarray(p)) # normalization
     p = list(p); e = list(e)
@@ -2637,7 +2636,7 @@ def buildBetaSpectra(rad, V, N, prt=False):
         e, p = readBetaShape(rad,"beta-",'tot')
     N = int(N)
     ev=[]
-    for i in range(N):
+    for i in tqdm(range(N), desc="Processing", unit=" bins"):
         ind = sampling(p)
         ev.append(energie_dep_beta2(e[ind],V))
     counts, bins = np.histogram(ev, bins=e, density=True)
@@ -2670,7 +2669,7 @@ def buildBetaSpectra(rad, V, N, prt=False):
                 file.write(f"{b}\t{p2[i]}\n")
                 
                 
-# N = 1e7
+N = 1e7
 # buildBetaSpectra('H-3', 16, N, prt=True); print('H-3 - done')
 # buildBetaSpectra('C-14', 16, N, prt=True); print('C-14 - done')
 # buildBetaSpectra('S-35', 16, N, prt=True); print('S-35 - done')
@@ -2681,5 +2680,5 @@ def buildBetaSpectra(rad, V, N, prt=False):
 # buildBetaSpectra('Tc-99', 16, N, prt=True); print('Tc-99 - done')
 # buildBetaSpectra('Pm-147', 16, N, prt=True); print('Pm-147 - done')
 # buildBetaSpectra('Pu-241', 16, N, prt=True); print('Pu-241 - done')
-# buildBetaSpectra('Co-60', 16, N, prt=True); print('Co-60 - done')
+buildBetaSpectra('Co-60', 16, N, prt=True); print('Co-60 - done')