TDCRPy 1.12.8__tar.gz → 1.12.10__tar.gz

{tdcrpy-1.12.8/TDCRPy.egg-info → tdcrpy-1.12.10}/PKG-INFO

@@ -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 → tdcrpy-1.12.10/TDCRPy.egg-info}/PKG-INFO

@@ -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 → tdcrpy-1.12.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = "1.12.8"
+VERSION = "1.12.10"
 
 DESCRIPTION = "TDCR model"
 

{tdcrpy-1.12.8 → tdcrpy-1.12.10}/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-1.12.8 → tdcrpy-1.12.10}/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-1.12.8 → tdcrpy-1.12.10}/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.