TDCRPy 2.0.7__py3-none-any.whl → 2.0.8__py3-none-any.whl

{TDCRPy-2.0.7.dist-info → TDCRPy-2.0.8.dist-info}/METADATA

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

TDCRPy-2.0.8.dist-info/RECORD

@@ -0,0 +1,81 @@
+tdcrpy/TDCRPy.py,sha256=WRH8ASoJSEXAl3Vw0t01DZelIJ4Kguu97nEriHuLq-g,64862
+tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
+tdcrpy/TDCR_model_lib.py,sha256=ehV5I7vRxnxq75KWVjE9NahA0-1VL54eMnTjbH5Q8l8,126576
+tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
+tdcrpy/__init__.py,sha256=9Djir8dPNchcJVQvhl-oRHEOsoDkiZlkOhWT-eHR7wQ,95
+tdcrpy/config.toml,sha256=d_olKEgxfobBHkZ2wEj9EgKE7I8Wbpim9ZAsi5ImFxk,1470
+tdcrpy/test2.py,sha256=poLLXJyIaCeqh1VSkwgbi-udvY7lQjxz_YStKjJXGhU,501
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_C-14.txt,sha256=Eh3KaNbfYHakk_uStLu8K1aFciO6_i_rS2yKxGGppDE,8416
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Ca-45.txt,sha256=TymodcK4ttoO1duZuW3RGOwHFwPPzw2ESPc_H_QQN8k,8830
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Co-60.txt,sha256=kxD5E7tk_Gc1Ylg8qCG1r3oB21m7wUT4zBWsmbseiMU,40203
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_H-3.txt,sha256=QJNhdLbIPpm8njOc1YBR3m16x0cG-2hhF1bDVIlzsic,8320
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Ni-63.txt,sha256=xvc6RPEmYOrUGGHOgVHmSajPuRG49fmKxXU-tZjpdLo,8869
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Pm-147.txt,sha256=MvxB_Ax2_AM_PQOLdTdUUt8LNrmh7li9hJk_Ugu7Xe0,8651
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Pu-241.txt,sha256=ZeAn2opKFgvvYzFtan18zqDf5_TG5gNstU2_4fyITgU,9228
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_S-35.txt,sha256=HUdghpHIKukza2_uw62w2COv6i4-1gCA3gbv8qeZc2Y,9016
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Sr-89.txt,sha256=dLdl_yULusR-C3xHqNK7cAs3Z_DgEwL3Hf_a0pSCFFU,8356
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Sr-90.txt,sha256=BcdNCg8azMW-M25dXroAeD-DNgUCGmaL9ay5zdc_Cpo,15248
+tdcrpy/MCNP-MATRIX/Spectra_for_analytical_model/dep_spectrum_Tc-99.txt,sha256=_8KEDdembKT79zM1LsaTiFdPp6bHW-S9f30eXliaTCc,8014
+tdcrpy/MCNP-MATRIX/matrice/fichier/E_depose.txt,sha256=NkeaRgZAiz9fB_sgsf0zJRdDxOEsonjqMU3HSbCSQo8,64129
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_10ml-beta-_1_200k.txt,sha256=bAjifmJH_9nRc8MWlqyUfMrKNrHSTu85dZYd2k7Sz_o,4213603
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_10ml-beta-_2000_10000k.txt,sha256=_K3dDYkwzAYbqwqBPv_lMB94LGcaJPPoLaGhvNmxGxA,16872466
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_10ml-beta-_200_2000k.txt,sha256=cVGktWekTTSFkGmgG-uIVcbRNNQ5jQf43DVBqDj7Sw0,18978766
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_10ml-photon_1_200k.txt,sha256=JqlkXfAP0zx27asFwp9ofxpRUHAVkwfbCq9uJ3wqaEs,4213603
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_10ml-photon_2000_10000k.txt,sha256=lPNY-a8__0HAvvE5kaC5Mzv5I1yLlV-1YL4PSBwtzJQ,16872466
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_10ml-photon_200_2000k.txt,sha256=8bzS9V0apkiGYAVWAzinGs0subLZgvkWoHaYVivSJ1o,18978766
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_13ml-beta-_1_200k.txt,sha256=b8J-4hEyr54ImgC_C_M4jZWVOHoM0cSu13A17W7nfYg,4213603
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_13ml-beta-_2000_10000k.txt,sha256=Y4kf4LyxVGoKQgbF3pgkJUfV0GkB9bGeEmSNAedqXiw,16872466
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_13ml-beta-_200_2000k.txt,sha256=6lGJUeQkP8sRw2tCZDZlQ3nrtPju6LFMhUQFLi3mBKY,18978766
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_13ml-photon_1_200k.txt,sha256=AIl93JKnOv84mS7D1T1ryECV4X1pcNnFEiZvRCgQEZo,4213603
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_13ml-photon_2000_10000k.txt,sha256=gQSUAK5J9cwzeIRCada-pVHCX8XVK8DIUoXZpLDmoAs,16872466
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_13ml-photon_200_2000k.txt,sha256=3j2Y1lBVefHH2B0i-UZYoB07qk2GFhyst4a3ZhkWuKE,18978766
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-beta-_1_200k.txt,sha256=3JEuFXWctT4KmPTDoMmO94uouRS8D8sUA_Yndf1mesQ,4213603
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-beta-_2000_10000k.txt,sha256=ojcqnJ8IoSvlpdWzmucVtMHUXR857qK5oVudRGvQSS4,16872466
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-beta-_200_2000k.txt,sha256=mqo4-ZdlSn38lJ692YSLsxCYEnzNcS8_dhZpX7LfITI,18978766
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_1_200k.txt,sha256=kxDaTMq-3H_telytHRV-bJXynqSyW9SmUMRVDW6y3yY,4213603
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_2000_10000k.txt,sha256=oKl_dTNoQCPAliK1erzvtO1PHBCRItAZvY0wkBa_qN4,16872466
+tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_200_2000k.txt,sha256=B1f_TWs6wzreI4mbYYJDOkm2aDik49w4yQ96tR7Awe0,18978766
+tdcrpy/Micelle/2nmfaq01.csv,sha256=nLnOq8HyJGJSHeJ91-ZLRUZPgmaogiHcQk1SicHYaqE,1340
+tdcrpy/Micelle/faq01.csv,sha256=pAERSkEojSzlJW_Lufp_UmCLDP2Xj0d0gI6EgMveC_s,7573
+tdcrpy/Quenching/QuenchEnergyAlpha_0.015.txt,sha256=kaSid3pQuBSwIeJ7CTmx6NsFgr2_A6u5GOgMqJiVvQA,195818
+tdcrpy/Quenching/QuenchEnergyAlpha_1.1e-05.txt,sha256=lozxOyzSB4FAukpuTQUGbtQHqiWldqMXXMgstEC76sc,182522
+tdcrpy/Quenching/QuenchEnergyAlpha_1.2e-05.txt,sha256=pjH7BVj9ohsPjL6hD6nJvL76nIL6HhkcVsmRYskI7dU,182825
+tdcrpy/Quenching/QuenchEnergyAlpha_1.3e-05.txt,sha256=HxecTi-9A-V5niGVz_w73SKHvoQDUrimBun3XlRJtzU,182903
+tdcrpy/Quenching/QuenchEnergyAlpha_1.4e-05.txt,sha256=tP4_1vUzOTYTreTYWA1w7922k2CZtC8aTbEPynC9doM,183085
+tdcrpy/Quenching/QuenchEnergyAlpha_1.5e-05.txt,sha256=QzP2sSQe5P_OMbfgrPbIEHwOmHFzy3M7yS001zFeEwQ,183344
+tdcrpy/Quenching/QuenchEnergyAlpha_1e-05.txt,sha256=39uybKh8rSGlewQ34vo_BIIzT_0WeVfJm9MFmnRzMKI,182418
+tdcrpy/Quenching/QuenchEnergyAlpha_6e-06.txt,sha256=J_bLgnNolr4zce5xPRlCwE5ow8SdacvNtiy-wA7fgI8,183575
+tdcrpy/Quenching/QuenchEnergyAlpha_7e-06.txt,sha256=ixhrw1dF8Y22cGSGTE1RsEPrzUWSb8zURZH3kC4h81g,183332
+tdcrpy/Quenching/QuenchEnergyAlpha_8e-06.txt,sha256=xfu7weEsCAPnDxTjy8ifw7rZdOi5U54CY0_5s78bhW0,182986
+tdcrpy/Quenching/QuenchEnergyAlpha_9e-06.txt,sha256=KdfsVNvmfRy6PWQXOAQwQaZFzVc10BQ9x_hXNGSoL2c,182611
+tdcrpy/Quenching/QuenchEnergyElectron_0.006.txt,sha256=HeoyfYbKI_6YUxNDrynlj00af-_TU6Mcynkt7xThksQ,181564
+tdcrpy/Quenching/QuenchEnergyElectron_0.007.txt,sha256=1quYASu3nJ8Vzhi-58sw1AAwaDHomsXJKDiPDszOr20,181528
+tdcrpy/Quenching/QuenchEnergyElectron_0.008.txt,sha256=cdwGUrm9k3blIOFAyhSsQOPt3doqv8_356WZZt5VdGE,181612
+tdcrpy/Quenching/QuenchEnergyElectron_0.009.txt,sha256=PUHKJihb8ziCniKtVi2mdfC3w6xSZz2ekENx7tC4nEU,181560
+tdcrpy/Quenching/QuenchEnergyElectron_0.01.txt,sha256=BX23Y57xg19TBoFg7J1oU0NFD7uk69ETywyfcyM2j0g,181558
+tdcrpy/Quenching/QuenchEnergyElectron_0.011.txt,sha256=LFVN8d9lnRcHkKSLsSW9LKfVSC437PjBmpPW7W8qSlo,181474
+tdcrpy/Quenching/QuenchEnergyElectron_0.012.txt,sha256=ImvhAp_S5roe2kpQXJs00BN7_tS1DsjorskBLOXW-5I,181477
+tdcrpy/Quenching/QuenchEnergyElectron_0.013.txt,sha256=qkSGhRTPkRaj9tHaxcYMrN1HnJCfZtIP-SCgSiXvWLg,181545
+tdcrpy/Quenching/QuenchEnergyElectron_0.014.txt,sha256=ds0cxeDL7aiHjPRnSIqj5mfcaVcwAPLz2CFz4TXniLQ,181661
+tdcrpy/Quenching/QuenchEnergyElectron_0.015.txt,sha256=AMYTsBO9TVvC1v29k-1SsvY7_Xl1cw7SQyHlgtwxH3Y,181566
+tdcrpy/Quenching/TandataUG.txt,sha256=AkUGz2dAZ6g3bQIIacR5f92aa8gmiklgRbN4Dyz-12k,260012
+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=4aTyDeOLFWAWjfkmr7Fk5xHtsva3RTAUq-8_ii6fLf0,7881260
+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
+tdcrpy/decayData/photo-ENDF.zip,sha256=eOiVUt6OKGl0a3pErfaibZzF_yoSzswdUCTbnGNlu7g,249674
+tdcrpy/docs/_build/html/genindex.html,sha256=FopjoEyhTbeh7qOem-A7er-6yCIfdhv1BIzs9dJocCc,2522
+tdcrpy/docs/_build/html/index.html,sha256=KbgBWH_0ixaswXk_lCM_pMk10v4rLs5qdPubj25SUMc,3443
+tdcrpy/docs/_build/html/search.html,sha256=IeTP6CsRdqKWOJttbtskg1oBgdN8norKlzai4Tmk8Kc,2799
+tdcrpy/docs/_build/html/source/modules.html,sha256=Jf-qxVBId0UgpwyvYuyjtMNG-ezPOK1oH_IxRXAWTRs,3601
+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=JINqSEMFoNpptE4f3h6ZzTYW1rBx90KkaoQzltSg-No,4692
+TDCRPy-2.0.8.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-2.0.8.dist-info/METADATA,sha256=3s-vedXlkbySOPoSmYAwZii7dKe_Tfmw7WG_1Wcnx4A,45040
+TDCRPy-2.0.8.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+TDCRPy-2.0.8.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-2.0.8.dist-info/RECORD,,

{TDCRPy-2.0.7.dist-info → TDCRPy-2.0.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tdcrpy/TDCR_model_lib.py

@@ -47,6 +47,13 @@ def readParameters(disp=False):
     RHO = config["Inputs"].getfloat("density")
     Z = config["Inputs"].getfloat("Z")
     A = config["Inputs"].getfloat("A")
+    pH = config["Inputs"].getfloat("pH")
+    pC = config["Inputs"].getfloat("pC")
+    pN = config["Inputs"].getfloat("pN")
+    pO = config["Inputs"].getfloat("pO")
+    pP = config["Inputs"].getfloat("pP")
+    pCl = config["Inputs"].getfloat("pCl")
+    
     depthSpline = config["Inputs"].getint("depthSpline")
     Einterp_a = config["Inputs"].getfloat("Einterp_a")
     Einterp_e = config["Inputs"].getfloat("Einterp_e")
@@ -60,6 +67,9 @@ def readParameters(disp=False):
         print(f"density = {RHO} g/cm3")
         print(f"Z = {Z}")
         print(f"A = {A}")
+        print(f"Atomic fraction: [H] = {pH:.6f}, [C] = {pC:.6f}")
+        print(f"[N] = {pN:.6f}, [O] = {pO:.6f}")
+        print(f"[P] = {pP:.6f}, [Cl] = {pCl:.6f}")
         print(f"depth of spline interp. = {depthSpline}")
         print(f"energy above which interp. in implemented (for alpha) = {Einterp_a} keV")
         print(f"energy above which interp. in implemented (for electron) = {Einterp_e} keV")
@@ -70,9 +80,12 @@ def readParameters(disp=False):
         print(f"extended dead time = {extDT} µs")
         print(f"measurement time = {measTime} min")
     
-    return nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr
+    return nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr, pH,pC,pN,pO,pP,pCl
+
+nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr, pH,pC,pN,pO,pP,pCl = readParameters()
 
-nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr = readParameters()
+p_atom = np.array([pH,pC,pN,pO,pP,pCl]) # atom abondance in the scintillator
+p_atom /= sum(p_atom) 
 
 def readConfigAsstr():
     path2config = str(config.read(file_conf)[0])
@@ -115,6 +128,17 @@ def modifyA(x):
     data1 = data0.replace(f"A = {x0}",f"A = {x}")
     writeConfifAsstr(data1)
 
+def modifyAtmConc(x):
+    data0 = readConfigAsstr()
+    x0 = readParameters()[-6:]
+    data1 = data0.replace(f"pH = {x0[0]:.6f}",f"pH = {x[0]:.6f}")
+    data1 = data1.replace(f"pC = {x0[1]:.6f}",f"pH = {x[1]:.6f}")
+    data1 = data1.replace(f"pN = {x0[2]:.6f}",f"pN = {x[2]:.6f}")
+    data1 = data1.replace(f"pO = {x0[3]:.6f}",f"pO = {x[3]:.6f}")
+    data1 = data1.replace(f"pP = {x0[4]:.6f}",f"pP = {x[4]:.6f}") #
+    data1 = data1.replace(f"pCl = {x0[5]:.6f}",f"pCl = {x[5]:.6f}")
+    writeConfifAsstr(data1)
+
 def modifyDepthSpline(x):
     data0 = readConfigAsstr()
     x0 = readParameters()[5]
@@ -2184,7 +2208,7 @@ def read_ENDF_photon(atom,z=z_endf_ph):
 
 
 
-def interaction_scintillation(e_p):
+def interaction_scintillation(e_p, p_atom=p_atom):
     """
     Simulation of the photoelectric interaction
 
@@ -2203,7 +2227,7 @@ def interaction_scintillation(e_p):
         target atom ('H', ...).
 
     """
-    p_atom = np.array([0.578772,0.338741,0.000302,0.082022,0.000092,0.000071]) # atom abondance in the scintillator
+    # p_atom = np.array([0.578772,0.338741,0.000302,0.082022,0.000092,0.000071]) # atom abondance in the scintillator
     atom = ['H','C','N','O','P','Cl']
     # sampling atom