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

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

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

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

@@ -1,6 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=qYl8BEI2lLm2oPGrnrxiFya7Y_aQU6dtyutUYHay4Yc,53858
+tdcrpy/TDCRPy.py,sha256=-eWgvVpjIOX2wb1ajxXTyD3GRBdaZw7J5Mce5YuJWs0,53857
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=u36N_8LaC4vgM0zEfwo9yqbFYLQz6ii8gVM25Sqyf7k,104749
+tdcrpy/TDCR_model_lib.py,sha256=VEkf1IFDXgwvt9OXmKd3blr465uNmXd84HSYeIoew7E,104713
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
 tdcrpy/config.toml,sha256=rHuuM520HZquGrEd8LAVUdvnzZGtk90pigudy-MXnm8,1389
@@ -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.5.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.9.5.dist-info/METADATA,sha256=BdXO8ADEQDC3XbRAWoPkY2HbT_Y00e-_jaZCBtKWUXM,15995
-TDCRPy-1.9.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-TDCRPy-1.9.5.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.9.5.dist-info/RECORD,,
+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/TDCRPy.py

@@ -181,7 +181,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
     elif (not Smodel) and (not Rad in radListPureBeta):
         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,10000)
+        out=tl.modelAnalytical(L,TD,TAB,TBC,TAC,Rad,kB,V,mode,mode2,1000)
         if mode == "res":
             return out
         if mode == "eff":

tdcrpy/TDCR_model_lib.py

@@ -2524,9 +2524,8 @@ def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,V,mode,mode2,ne):
     e, p = readBetaSpectra(rad)
     em=np.empty(len(e))
     for i, ei in enumerate(e):
-        # ed = energie_dep_beta2(ei,V)
-        em[i] = E_quench_e(ei*1e3,ei*1e3,kB*1e3,ne)*1e-3
-        # em[i] = Em_e(ei*1e3,ei*1e3,kB*1e3,ne)*1e-3
+        #em[i] = E_quench_e(ei*1e3,ei*1e3,kB*1e3,ne)*1e-3
+        em[i] = Em_e(ei*1e3,ei*1e3,kB*1e3,ne)*1e-3
         
         
     if mode2=="sym":
@@ -2671,7 +2670,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')
@@ -2682,5 +2681,5 @@ N = 1e7
 # 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')