TDCRPy 1.8.11__py3-none-any.whl → 1.8.14__py3-none-any.whl

{TDCRPy-1.8.11.dist-info → TDCRPy-1.8.14.dist-info}/METADATA

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

{TDCRPy-1.8.11.dist-info → TDCRPy-1.8.14.dist-info}/RECORD

@@ -1,9 +1,9 @@
 tdcrpy/TDCRPy.py,sha256=XJHHuGwsp_yn422nupus6luRAp4a58vZPT9PO8ilOVE,53211
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=kuNuddKJEE4l1QpxKPCi5-8PhimSqsv7qxzTFaBxn8M,96068
+tdcrpy/TDCR_model_lib.py,sha256=PE4365_HRBc5lB_4n0W2-UQ32LF9juA0Z_mI4M2cxtI,96132
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
-tdcrpy/config.toml,sha256=OP3lOMDxn8MbjnX7zMHaICivBybYZlnmOMmEEmUjmhQ,1628
+tdcrpy/config.toml,sha256=xPejXoPI4m4FgG8hIYLEyMA-y8MBCF3PaWtv55TqHeQ,1646
 tdcrpy/test2.py,sha256=poLLXJyIaCeqh1VSkwgbi-udvY7lQjxz_YStKjJXGhU,501
 tdcrpy/EfficiencyCurves/Ag-108/EffD_Ag-108_[1]_1e-05.txt,sha256=OUoMuqPTw3fXLu5qaHUFN2iW0dPJ9cRyh99a6mUcEus,43
 tdcrpy/EfficiencyCurves/Ag-108/EffS_Ag-108_[1]_1e-05.txt,sha256=hojCq_MFAw8ONjoDmQfeE9gCXISwhScgAk-N0Pjbg00,45
@@ -1078,8 +1078,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=3b9PeT2ROGGEFM_G4EVlDQMdP4B3ONp4a0kh1bKyVkI,4003
-TDCRPy-1.8.11.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.8.11.dist-info/METADATA,sha256=KORPiKdEVTeaBgGTg75mbqdatOgHLUYnNvnsdBuadpk,15601
-TDCRPy-1.8.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-TDCRPy-1.8.11.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.8.11.dist-info/RECORD,,
+TDCRPy-1.8.14.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.8.14.dist-info/METADATA,sha256=tsr1_9F0SFVSoetVUUZtOPfQGkxQ0UU1LAaFqidjI20,15601
+TDCRPy-1.8.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+TDCRPy-1.8.14.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.8.14.dist-info/RECORD,,

tdcrpy/TDCR_model_lib.py

@@ -38,7 +38,8 @@ RHO = config["Inputs"].getfloat("density")
 Z = config["Inputs"].getfloat("Z")
 A = config["Inputs"].getfloat("A")
 depthSpline = config["Inputs"].getint("depthSpline")
-Einterp = config["Inputs"].getfloat("Einterp")
+Einterp_a = config["Inputs"].getfloat("Einterp_a")
+Einterp_e = config["Inputs"].getfloat("Einterp_e")
 
 # import PenNuc data
 with importlib.resources.as_file(files('tdcrpy').joinpath('decayData')) as data_path:
@@ -894,7 +895,7 @@ def run_interpolate(kB_vec, kB , Ev, Emv, E, m = depthSpline):
         r = f2(E)+(f1(E) - f2(E))/(kB_vec[ind_k]-kB_vec[ind_k-1])*(kB-kB_vec[ind_k-1])
     return r
 
-def Em_a(E, kB, nE, Et = Einterp, kB_vec = kB_a):
+def Em_a(E, kB, nE, Et = Einterp_a, kB_vec = kB_a):
     """
     This fonction management the calculation of the quenched energy for alpha particles.
     A mixture between the accurate quenching model and the extrapolated model can be setup. 
@@ -918,6 +919,7 @@ def Em_a(E, kB, nE, Et = Einterp, kB_vec = kB_a):
         interpolated quenched energy in keV
 
     """
+    
     if E <= Et:
         # run the accurate quenching model
         r = E_quench_a(E,kB,nE)
@@ -926,7 +928,7 @@ def Em_a(E, kB, nE, Et = Einterp, kB_vec = kB_a):
         r = run_interpolate(kB_vec, kB , Ei_alpha, Em_alpha, E)    
     return r
 
-def Em_e(Ei, Ed, kB, nE, Et = Einterp*1e3, kB_vec = kB_e):
+def Em_e(Ei, Ed, kB, nE, Et = Einterp_e*1e3, kB_vec = kB_e):
     """
     This fonction management the calculation of the quenched energy for electrons.
     A mixture between the accurate quenching model and the extrapolated model can be setup. 

tdcrpy/config.toml

@@ -41,4 +41,5 @@ tau = 50
 # depth (number of indexes on each side of the energy point) on which the spline interpolation is done.
 depthSpline = 5
 # energy (in keV) above which interpolation is applied.
-Einterp = 1
+Einterp_a = 100
+Einterp_e = 1