TDCRPy 1.9.4__py3-none-any.whl → 1.9.6__py3-none-any.whl

{TDCRPy-1.9.4.dist-info → TDCRPy-1.9.6.dist-info}/METADATA

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

{TDCRPy-1.9.4.dist-info → TDCRPy-1.9.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 tdcrpy/TDCRPy.py,sha256=qYl8BEI2lLm2oPGrnrxiFya7Y_aQU6dtyutUYHay4Yc,53858
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=WE3onlbl2gQtLiGRbQd-6IJR7cZiPKRvJicAysnCr84,104289
+tdcrpy/TDCR_model_lib.py,sha256=YfOTuOqywl9gMqP7FlJo6I28obn4Qyv3zUHTRW7HZYs,104753
 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=Iu3Yg6SOB9vRjAG-q9bR57rdjoGZc47tzKX9_gCdeNM,7045047
+tdcrpy/decayData/All-nuclides_BetaShape.zip,sha256=JfbU66QYnYIki7nmwbXBnf7MDOa7JDBqFv4hEsEQQyM,7130930
 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.4.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.9.4.dist-info/METADATA,sha256=MkUXBke9Oq2ivZ3I2HBD1e21LjKFDkE_O9PSiUQ37hE,15995
-TDCRPy-1.9.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-TDCRPy-1.9.4.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.9.4.dist-info/RECORD,,
+TDCRPy-1.9.6.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.9.6.dist-info/METADATA,sha256=tA4rnXeUBedoSDn3z2B1bPcY7GQmE3CSq1kX27q4Ego,15995
+TDCRPy-1.9.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+TDCRPy-1.9.6.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.9.6.dist-info/RECORD,,

tdcrpy/TDCR_model_lib.py

@@ -209,7 +209,8 @@ with importlib.resources.as_file(files('tdcrpy').joinpath('MCNP-MATRIX')) as dat
     sTc99 = data_path / 'Spectra_for_analytical_model/dep_spectrum_Tc-99.txt'
     sPm147 = data_path / 'Spectra_for_analytical_model/dep_spectrum_Pm-147.txt'
     sPu241 = data_path / 'Spectra_for_analytical_model/dep_spectrum_Pu-241.txt'
-
+    sCo60 = data_path / 'Spectra_for_analytical_model/dep_spectrum_Co-60.txt'
+    
 # import stopping power data for electron
 with importlib.resources.as_file(files('tdcrpy').joinpath('Quenching')) as data_path:
 #with importlib.resources.path('tdcrpy', 'Quenching') as data_path:
@@ -788,6 +789,8 @@ def readBetaShape(rad,mode,level,z=z_betashape):
     Rad = rad.replace('-','')
     if level == 'tot':
         name_doc = Rad+'/'+mode+'_'+Rad+'_tot.bs'
+    elif level == 'tot_myEstep':
+        name_doc = Rad+'/'+mode+'_'+Rad+'_tot_myEstep.bs'
     else:
         name_doc = Rad+'/'+mode+'_'+Rad+'_'+ "trans" + str(level) +'.bs'
     with z.open(name_doc) as file_trans:
@@ -901,6 +904,7 @@ def readBetaSpectra(rad):
     elif rad == "Tc-99": file_path = sTc99
     elif rad == "Pm-147": file_path = sPm147
     elif rad == "Pu-241": file_path = sPu241
+    elif rad == "Co-60": file_path = sCo60
 
     with open(file_path, "r") as file:
         for line in file:
@@ -2627,7 +2631,11 @@ def buildBetaSpectra(rad, V, N, prt=False):
     None.
 
     """
-    e, p = readBetaShape(rad,"beta-",'tot')
+    # e, p = readBetaShape(rad,"beta-",'tot')
+    if rad=="Co-60":
+        e, p = readBetaShape(rad,"beta-",'tot_myEstep')
+    else:
+        e, p = readBetaShape(rad,"beta-",'tot')
     N = int(N)
     ev=[]
     for i in range(N):
@@ -2655,6 +2663,7 @@ def buildBetaSpectra(rad, V, N, prt=False):
     elif rad == "Tc-99": file_path = sTc99
     elif rad == "Pm-147": file_path = sPm147
     elif rad == "Pu-241": file_path = sPu241
+    elif rad == "Co-60": file_path = sCo60
     
     if prt:
         with open(file_path, "w") as file:
@@ -2662,7 +2671,7 @@ def buildBetaSpectra(rad, V, N, prt=False):
                 file.write(f"{b}\t{p2[i]}\n")
                 
                 
-# N = 1e6
+# 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')
@@ -2673,4 +2682,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')