TDCRPy 1.12.5__py3-none-any.whl → 1.12.8__py3-none-any.whl

{TDCRPy-1.12.5.dist-info → TDCRPy-1.12.8.dist-info}/METADATA

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

{TDCRPy-1.12.5.dist-info → TDCRPy-1.12.8.dist-info}/RECORD

@@ -1,9 +1,9 @@
-tdcrpy/TDCRPy.py,sha256=-HhkBRjAU04jTMroHgSQ3yfI_IpYTrK35cPo67bV1RI,53904
+tdcrpy/TDCRPy.py,sha256=EQt-DPGO1ffJs_8TNSOUxR--1W9XukACawo7DgUNne8,53989
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=x06qjdfJpo24iRj4EWXjGEOb2CSrExbdAL0nMlp8Bro,106017
+tdcrpy/TDCR_model_lib.py,sha256=Rgc0JpRKGN79C4IhsGxlCi185xxIrKfRCF8oLRAqH44,106606
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
-tdcrpy/config.toml,sha256=rHuuM520HZquGrEd8LAVUdvnzZGtk90pigudy-MXnm8,1389
+tdcrpy/config.toml,sha256=0SXcv120NwqquXLw4w3P9d4uG0pctU7EvF0mzGarfGw,1427
 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
@@ -1043,7 +1043,7 @@ tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_1_200k.txt,sha256=kxDaTMq
 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=r_tRhRp8ePqnBxlA6dgZadzR2M7i785rzPoD43wiFSU,7571
+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
@@ -1081,8 +1081,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=JINqSEMFoNpptE4f3h6ZzTYW1rBx90KkaoQzltSg-No,4692
-TDCRPy-1.12.5.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.12.5.dist-info/METADATA,sha256=xxdBCU9q0jB-pjBHRiUPnpWTTiaEFtk3PFBR6NN8u8o,15832
-TDCRPy-1.12.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-TDCRPy-1.12.5.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.12.5.dist-info/RECORD,,
+TDCRPy-1.12.8.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.12.8.dist-info/METADATA,sha256=OEjNvvIMvaU1hd6FLP9hPiyV92aOGx7o598RNp3IMWU,15832
+TDCRPy-1.12.8.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+TDCRPy-1.12.8.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.12.8.dist-info/RECORD,,

{TDCRPy-1.12.5.dist-info → TDCRPy-1.12.8.dist-info}/WHEEL

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

tdcrpy/Micelle/faq01.csv

@@ -9,9 +9,9 @@
 80;0.88;0.86;0.78;0.7;0.62;0.56;0.51;0.47;0.42;0.35
 90;0.88;0.86;0.79;0.71;0.63;0.57;0.52;0.49;0.44;0.35
 100;0.88;0.87;0.8;0.72;0.64;0.6;0.54;0.5;0.45;0.36
-110;0.89;0.87;0.8;0.73;0.65;0.62;0.56;0.51;0.56;0.37
+110;0.89;0.87;0.8;0.73;0.65;0.62;0.56;0.51;0.46;0.37
 120;0.89;0.87;0.81;0.74;0.67;0.64;0.57;0.53;0.47;0.38
-130;0.89;0.87;0.82;0.75;0.68;65;0.58;0.54;0.48;0.4
+130;0.89;0.87;0.82;0.75;0.68;0.65;0.58;0.54;0.48;0.4
 140;0.89;0.87;0.82;0.76;0.69;0.67;0.59;0.56;0.49;0.42
 150;0.89;0.88;0.83;0.77;0.71;0.69;0.6;0.58;0.5;0.43
 160;0.89;0.88;0.83;0.78;0.72;0.7;0.62;0.6;0.51;0.44

tdcrpy/TDCRPy.py

@@ -166,6 +166,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
         file_conf = data_path       
     config.read(file_conf)
     tau=config["Inputs"].getfloat("tau")
+    extDT=config["Inputs"].getfloat("extDT")
     micCorr=config["Inputs"].getboolean("micCorr")
     radListPureBeta = ["H-3", "C-14", "S-35", "Ca-45", "Ni-63", "Sr-89", "Sr-90", "Tc-99", "Pm-147", "Pu-241"]
     if (Rad in radListPureBeta) and (not Smodel):
@@ -694,7 +695,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
             ====================
             '''            
             if mode2=="sym":
-                if evenement !=1:
+                if evenement !=1 and t1 > extDT*1e-6:
                     p_nosingle = np.exp(-L*np.sum(np.asarray(e_quenching))/3) # probability to have 0 electrons in a PMT
                     p_single = 1-p_nosingle                                    # probability to have at least 1 electrons in a PMT
                     p_nosingle2 = np.exp(-L*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
@@ -727,7 +728,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                     if Display: print("\t\t Efficiency of triple events = ", round(efficiency_T[-1],5))                    
                                     
             elif mode2=="asym":
-                if evenement !=1:
+                if evenement !=1 and t1 > extDT*1e-6:
                     pA_nosingle = np.exp(-L[0]*np.sum(np.asarray(e_quenching))/3) # probability to have 0 electrons in a PMT
                     pA_single = 1-pA_nosingle                                    # probability to have at least 1 electrons in a PMT
                     pB_nosingle = np.exp(-L[1]*np.sum(np.asarray(e_quenching))/3) # probability to have 0 electrons in a PMT

tdcrpy/TDCR_model_lib.py

@@ -41,6 +41,7 @@ def readParameters(disp=False):
     nE_electron = config["Inputs"].getint("nE_electron")
     nE_alpha = config["Inputs"].getint("nE_alpha")
     tau = config["Inputs"].getint("tau")
+    extDT = config["Inputs"].getint("extDT")
     RHO = config["Inputs"].getfloat("density")
     Z = config["Inputs"].getfloat("Z")
     A = config["Inputs"].getfloat("A")
@@ -49,6 +50,7 @@ def readParameters(disp=False):
     Einterp_e = config["Inputs"].getfloat("Einterp_e")
     diam_micelle = config["Inputs"].getfloat("diam_micelle")
     fAq = config["Inputs"].getfloat("fAq")
+    micCorr = config["Inputs"].getboolean("micCorr")
     
     if disp:
         print(f"number of integration bins for electrons = {nE_electron}")
@@ -59,13 +61,15 @@ def readParameters(disp=False):
         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")
+        print(f"activation of the micelle correction = {micCorr}")
         print(f"diameter of micelle = {diam_micelle} nm")
         print(f"acqueous fraction = {fAq}")
         print(f"coincidence resolving time = {tau} ns")
+        print(f"extended dead time = {extDT} µs")
     
-    return nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau
+    return nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, micCorr
 
-nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau = readParameters()
+nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, micCorr = readParameters()
 
 def readConfigAsstr():
     path2config = str(config.read(file_conf)[0])
@@ -144,6 +148,18 @@ def modifyTau(x):
     data1 = data0.replace(f"tau = {x0}",f"tau = {x}")
     writeConfifAsstr(data1)
 
+def modifyDeadTime(x):
+    data0 = readConfigAsstr()
+    x0 = readParameters()[11]
+    data1 = data0.replace(f"extDT = {x0}",f"extDT= {x}")
+    writeConfifAsstr(data1)
+
+def modifyMicCorr(x):
+    data0 = readConfigAsstr()
+    x0 = readParameters()[12]
+    data1 = data0.replace(f"micCorr = {x0}",f"micCorr= {x}")
+    writeConfifAsstr(data1)
+
 # import PenNuc data
 with importlib.resources.as_file(files('tdcrpy').joinpath('decayData')) as data_path:
 #with importlib.resources.path('tdcrpy', 'decayData') as data_path:

tdcrpy/config.toml

@@ -34,6 +34,8 @@ fAq = 0.1
 ## PROPERTIES OF THE COUNTER
 # Coincidence resolving time (ns)
 tau = 50
+# Extended dead time (µs)
+extDT = 10
 
 ## INTERPOLATION TO ESTIMATE THE QUENCHED ENERGY
 # depth (number of indexes on each side of the energy point) on which the spline interpolation is done.