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

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

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

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

@@ -1,9 +1,9 @@
-tdcrpy/TDCRPy.py,sha256=EQt-DPGO1ffJs_8TNSOUxR--1W9XukACawo7DgUNne8,53989
+tdcrpy/TDCRPy.py,sha256=r9n6AK4_8Oy7UF-asFMOd7kAgdaXuvT3BYLn33QhUko,54082
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=Rgc0JpRKGN79C4IhsGxlCi185xxIrKfRCF8oLRAqH44,106606
+tdcrpy/TDCR_model_lib.py,sha256=Vqbd-JVhGdF9BzW9axYwCHl2MOBfupCJ1ih5Nz_aXts,106906
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
-tdcrpy/config.toml,sha256=0SXcv120NwqquXLw4w3P9d4uG0pctU7EvF0mzGarfGw,1427
+tdcrpy/config.toml,sha256=d_olKEgxfobBHkZ2wEj9EgKE7I8Wbpim9ZAsi5ImFxk,1470
 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
@@ -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.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.10.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.12.10.dist-info/METADATA,sha256=QvGnz71W4UM-DqHH6Hd2_tXhgqm1ZmroKRwlC9SMS-0,15833
+TDCRPy-1.12.10.dist-info/WHEEL,sha256=Rp8gFpivVLXx-k3U95ozHnQw8yDcPxmhOpn_Gx8d5nc,91
+TDCRPy-1.12.10.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.12.10.dist-info/RECORD,,

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

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

tdcrpy/TDCRPy.py

@@ -167,6 +167,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
     config.read(file_conf)
     tau=config["Inputs"].getfloat("tau")
     extDT=config["Inputs"].getfloat("extDT")
+    measTime=config["Inputs"].getfloat("measTime")
     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):
@@ -695,7 +696,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
             ====================
             '''            
             if mode2=="sym":
-                if evenement !=1 and t1 > extDT*1e-6:
+                if evenement !=1 and t1 > extDT*1e-6 and t1 < measTime*60:
                     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
@@ -728,7 +729,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 and t1 > extDT*1e-6:
+                if evenement !=1 and t1 > extDT*1e-6 and t1 < measTime*60:
                     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

@@ -42,6 +42,7 @@ def readParameters(disp=False):
     nE_alpha = config["Inputs"].getint("nE_alpha")
     tau = config["Inputs"].getint("tau")
     extDT = config["Inputs"].getint("extDT")
+    measTime = config["Inputs"].getint("measTime")
     RHO = config["Inputs"].getfloat("density")
     Z = config["Inputs"].getfloat("Z")
     A = config["Inputs"].getfloat("A")
@@ -66,10 +67,11 @@ def readParameters(disp=False):
         print(f"acqueous fraction = {fAq}")
         print(f"coincidence resolving time = {tau} ns")
         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, micCorr
+    return nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr
 
-nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, micCorr = readParameters()
+nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr = readParameters()
 
 def readConfigAsstr():
     path2config = str(config.read(file_conf)[0])
@@ -151,12 +153,18 @@ def modifyTau(x):
 def modifyDeadTime(x):
     data0 = readConfigAsstr()
     x0 = readParameters()[11]
-    data1 = data0.replace(f"extDT = {x0}",f"extDT= {x}")
+    data1 = data0.replace(f"extDT = {x0}",f"extDT = {x}")
     writeConfifAsstr(data1)
 
-def modifyMicCorr(x):
+def modifyMeasTime(x):
     data0 = readConfigAsstr()
     x0 = readParameters()[12]
+    data1 = data0.replace(f"measTime = {x0}",f"measTime = {x}")
+    writeConfifAsstr(data1)
+
+def modifyMicCorr(x):
+    data0 = readConfigAsstr()
+    x0 = readParameters()[13]
     data1 = data0.replace(f"micCorr = {x0}",f"micCorr= {x}")
     writeConfifAsstr(data1)
 

tdcrpy/config.toml

@@ -36,6 +36,8 @@ fAq = 0.1
 tau = 50
 # Extended dead time (µs)
 extDT = 10
+# Measurement time (minutes)
+measTime = 20
 
 ## INTERPOLATION TO ESTIMATE THE QUENCHED ENERGY
 # depth (number of indexes on each side of the energy point) on which the spline interpolation is done.