TDCRPy 1.5.1__tar.gz → 1.5.2__tar.gz

{TDCRPy-1.5.1/TDCRPy.egg-info → TDCRPy-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 1.5.1
+Version: 1.5.2
 Summary: TDCR model
 Home-page: https://github.com/RomainCoulon/TDCRPy
 Author: RomainCoulon (Romain Coulon)

{TDCRPy-1.5.1 → TDCRPy-1.5.2/TDCRPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 1.5.1
+Version: 1.5.2
 Summary: TDCR model
 Home-page: https://github.com/RomainCoulon/TDCRPy
 Author: RomainCoulon (Romain Coulon)

{TDCRPy-1.5.1 → TDCRPy-1.5.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = "1.5.1"
+VERSION = "1.5.2"
 DESCRIPTION = "TDCR model"
 
 with open("README.md", "r") as f:
@@ -36,6 +36,7 @@ setup(
     ],
     include_package_data = True,
     package_data = {'': [
+		'config.toml',
 	    	'decayData/All-nuclides_PenNuc.zip',
         	'decayData/All-nuclides_BetaShape.zip',
 		'decayData/All-nuclides_Ensdf.zip',

{TDCRPy-1.5.1 → TDCRPy-1.5.2}/tdcrpy/TDCRPy.py

@@ -568,18 +568,18 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                 
                 for i, p in enumerate(particle_vec):
                     if p == "electron":
-                        energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
+                        energy_vec[i] = tl.energie_dep_beta2(energy_vec[i],v=V)
         
                     if p == "beta+":
-                        energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
+                        energy_vec[i] = tl.energie_dep_beta2(energy_vec[i],v=V)
         
                     if p == "gamma" or p == "XKA" or p == "XKB" or p == "XL":
-                        energy_vec[i] = tl.energie_dep_gamma(energy_vec[i],v=V)          # sampling energy free from photon
+                        energy_vec[i] = tl.energie_dep_gamma2(energy_vec[i],v=V)          # sampling energy free from photon
                         particle_vec[i] = "electron"
                         
                     if p == "Auger K" or p == "Auger L":
                         particle_vec[i] = "electron"
-                        energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
+                        energy_vec[i] = tl.energie_dep_beta2(energy_vec[i],v=V)
                         
                 if Display:
                     print("\n\t INTERACTION \n\t Summary of the energy deposited by charged particles from the prompt transitions")
@@ -588,18 +588,18 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                 
                 for i, p in enumerate(particle_vec2):
                     if p == "electron":
-                        energy_vec2[i] = tl.energie_dep_beta(energy_vec2[i])
+                        energy_vec2[i] = tl.energie_dep_beta2(energy_vec2[i],v=V)
         
                     if p == "beta+":
-                        energy_vec2[i] = tl.energie_dep_beta(energy_vec2[i])
+                        energy_vec2[i] = tl.energie_dep_beta2(energy_vec2[i],v=V)
         
                     if p == "gamma" or p == "XKA" or p == "XKB" or p == "XL":
-                        energy_vec2[i] = tl.energie_dep_gamma(energy_vec2[i],v=V)          # sampling energy free from photon
+                        energy_vec2[i] = tl.energie_dep_gamma2(energy_vec2[i],v=V)          # sampling energy free from photon
                         particle_vec2[i] = "electron"
                         
                     if p == "Auger K" or p == "Auger L":
                         particle_vec2[i] = "electron"
-                        energy_vec2[i] = tl.energie_dep_beta(energy_vec2[i])
+                        energy_vec2[i] = tl.energie_dep_beta2(energy_vec2[i],v=V)
                         
                 if Display:
                     print("\t Summary of the energy deposited by charged particles from the delayed transitions")
@@ -805,18 +805,18 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
 
                 for i, p in enumerate(particle_vec):
                     if p == "electron":
-                        energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
+                        energy_vec[i] = tl.energie_dep_beta2(energy_vec[i],v=V)
         
                     if p == "beta+":
-                        energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
+                        energy_vec[i] = tl.energie_dep_beta2(energy_vec[i],v=V)
         
                     if p == "gamma" or p == "XKA" or p == "XKB" or p == "XL":
-                        energy_vec[i] = tl.energie_dep_gamma(energy_vec[i],v=V)          # sampling energy free from photon
+                        energy_vec[i] = tl.energie_dep_gamma2(energy_vec[i],v=V)          # sampling energy free from photon
                         particle_vec[i] = "electron"
                         
                     if p == "Auger K" or p == "Auger L":
                         particle_vec[i] = "electron"
-                        energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
+                        energy_vec[i] = tl.energie_dep_beta2(energy_vec[i],v=V)
                 
                 if Display:
                     print("\n\t INTERACTION \n\t Summary of the energy deposited by charged particles")
@@ -952,11 +952,11 @@ TD = 0.977667386529166
 TAB = 0.992232838598821
 TBC = 0.992343419459002
 TAC = 0.99275350064608
-Rad="Co-60"
+Rad="Tl-201"
 pmf_1="1"
 N = 10
 kB =1.0e-5
-V = 10
+V = 12
 mode = "dis"
 mode2 = "sym"
 

{TDCRPy-1.5.1 → TDCRPy-1.5.2}/tdcrpy/TDCR_model_lib.py

@@ -1146,7 +1146,7 @@ def energie_dep_gamma2(e_inci,v,matrice10_1=Matrice10_p_1,matrice10_2=Matrice10_
     if result  > e_inci: result = e_inci
     return result
 
-def energie_dep_beta(e_inci,*,matrice10_1=Matrice10_e_1,matrice10_2=Matrice10_e_2,matrice10_3=Matrice10_e_3,matrice16_1=Matrice16_e_1,matrice16_2=Matrice16_e_2,ed=Matrice_e):
+def energie_dep_beta(e_inci,*,matrice10_1=Matrice10_e_1,matrice10_2=Matrice10_e_2,matrice10_3=Matrice10_e_3,matrice16_1=Matrice16_e_1,matrice16_2=Matrice16_e_2,matrice16_3=Matrice16_e_3,ed=Matrice_e):
     ## sort keV / entrée : keV
     if e_inci <= 200:
         if e_inci < 1: