TDCRPy 2.7.0__py3-none-any.whl → 2.8.0__py3-none-any.whl

tdcrpy/TDCR_model_lib.py

@@ -62,6 +62,7 @@ def readParameters(disp=False):
     micCorr = config["Inputs"].getboolean("micCorr")
     alphaDir = config["Inputs"].getfloat("alphaDir")
     effQuantic = config["Inputs"].getfloat("effQuantum")
+    optionModel = config["Inputs"].getfloat("optionModel")
     
     if disp:
         print(f"number of integration bins for electrons = {nE_electron}")
@@ -80,13 +81,14 @@ def readParameters(disp=False):
         print(f"acqueous fraction = {fAq}")
         print(f"alpha parameter of the hidden Dirichlet process = {alphaDir}")
         print(f"quantum efficiency of the photocathodes = {effQuantic}")
+        print(f"Monte Carlo model of the optics = {optionModel}")
         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, measTime, micCorr, alphaDir, effQuantic, pH,pC,pN,pO,pP,pCl
+    return nE_electron, nE_alpha, RHO, Z, A, depthSpline, Einterp_a, Einterp_e, diam_micelle, fAq, tau, extDT, measTime, micCorr, alphaDir, effQuantic, optionModel, 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, alphaDir, effQuantic, 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, alphaDir, effQuantic, optionModel, pH,pC,pN,pO,pP,pCl = readParameters()
 
 p_atom = np.array([pH,pC,pN,pO,pP,pCl]) # atom abondance in the scintillator
 p_atom /= sum(p_atom) 
@@ -209,6 +211,12 @@ def modifyEffQ(x):
     data1 = data0.replace(f"effQuantum = {x0}",f"effQuantum = {x}")
     writeConfifAsstr(data1)
 
+def modifyOptModel(x):
+    data0 = readConfigAsstr()
+    x0 = readParameters()[16]
+    data1 = data0.replace(f"optionModel = {x0}",f"optionModel = {x}")
+    writeConfifAsstr(data1)
+
 def read_temp_files(copy=False, path="C:"):
     
     temp_dir = tempfile.gettempdir()
@@ -3020,7 +3028,7 @@ def detectProbabilities(L, e_quenching, e_quenching2, t1, evenement, extDT, meas
     return efficiency0_S, efficiency0_D, efficiency0_T, efficiency0_AB, efficiency0_BC, efficiency0_AC, efficiency0_D2        
 
 
-def detectProbabilitiesMC(L, e_quenching, e_quenching2, t1, evenement, extDT, measTime, dir_param = alphaDir, effQuantic = effQuantic):
+def detectProbabilitiesMC(L, e_quenching, e_quenching2, t1, evenement, extDT, measTime, dir_param = alphaDir, effQuantic = effQuantic, optionModel=optionModel):
     """
     Calculate detection probabilities for LS counting systems - see Broda, R., Cassette, P., Kossert, K., 2007. Radionuclide metrology using liquid scintillation counting. Metrologia 44. https://doi.org/10.1088/0026-1394/44/4/S06 
 
@@ -3079,79 +3087,121 @@ def detectProbabilitiesMC(L, e_quenching, e_quenching2, t1, evenement, extDT, me
     n_e = np.zeros(3); n_eCN = np.zeros(2); n_e2 = np.zeros(3); n_e2CN = np.zeros(2)
     
     if symm:
-        n_ph = np.random.poisson(sum(np.asarray(e_quenching))*L/mu)
-        # TDCR
-        n_phPMT = np.random.multinomial(n_ph, dirichTD)
-        n_e[0]=np.random.binomial(n_phPMT[0],mu)
-        n_e[1]=np.random.binomial(n_phPMT[1],mu)
-        n_e[2]=np.random.binomial(n_phPMT[2],mu)
+        if optionModel == "poisson-multinomial-binomial":
+            n_ph = np.random.poisson(sum(np.asarray(e_quenching))*L/mu)
+            # TDCR
+            n_phPMT = np.random.multinomial(n_ph, dirichTD)
+            n_e[0]=np.random.binomial(n_phPMT[0],mu)
+            n_e[1]=np.random.binomial(n_phPMT[1],mu)
+            n_e[2]=np.random.binomial(n_phPMT[2],mu)
+            # C/N
+            n_phPMTCN = np.random.multinomial(n_ph, dirichCN)
+            n_eCN[0]=np.random.binomial(n_phPMTCN[0],mu)
+            n_eCN[1]=np.random.binomial(n_phPMTCN[1],mu)
+        elif optionModel == "poisson":
+            n_e[0] = np.random.poisson(sum(np.asarray(e_quenching))*L*mu*dirichTD[0])
+            n_e[1] = np.random.poisson(sum(np.asarray(e_quenching))*L*mu*dirichTD[1])
+            n_e[2] = np.random.poisson(sum(np.asarray(e_quenching))*L*mu*dirichTD[2])
+            n_eCN[0] = np.random.poisson(sum(np.asarray(e_quenching))*L*mu*dirichCN[0])
+            n_eCN[1] = np.random.poisson(sum(np.asarray(e_quenching))*L*mu*dirichCN[1])           
+        else:
+            print("unknown model")        
+                
         if sum(n_e>1)>0: efficiency0_S =1
         if sum(n_e>1)>1: efficiency0_D =1
         if sum(n_e>1)>2: efficiency0_T =1
         if n_e[0]>1 and n_e[1]>1: efficiency0_AB =1 
         if n_e[1]>1 and n_e[2]>1: efficiency0_BC =1 
         if n_e[0]>1 and n_e[2]>1: efficiency0_AC =1
-        # C/N
-        n_phPMT = np.random.multinomial(n_ph, dirichCN)
-        n_eCN[0]=np.random.binomial(n_phPMT[0],mu)
-        n_eCN[1]=np.random.binomial(n_phPMT[1],mu)        
-        if sum(n_e>1)>1: efficiency0_D2 =1
+        if sum(n_eCN>1)>1: efficiency0_D2 =1
         
-        if evenement !=1 and t1 > extDT*1e-6 and t1 < measTime*60:  
-            n_ph2 = np.random.poisson(sum(np.asarray(e_quenching2))*L/mu)
-            # TDCR
-            n_phPMT2 = np.random.multinomial(n_ph2, dirichTD)
-            n_e2[0]=np.random.binomial(n_phPMT2[0],mu)
-            n_e2[1]=np.random.binomial(n_phPMT2[1],mu)
-            n_e2[2]=np.random.binomial(n_phPMT2[2],mu)            
+        if evenement !=1 and t1 > extDT*1e-6 and t1 < measTime*60:
+            if optionModel == "poisson-multinomial-binomial":
+                n_ph2 = np.random.poisson(sum(np.asarray(e_quenching2))*L/mu)
+                # TDCR
+                n_phPMT2 = np.random.multinomial(n_ph2, dirichTD)
+                n_e2[0]=np.random.binomial(n_phPMT2[0],mu)
+                n_e2[1]=np.random.binomial(n_phPMT2[1],mu)
+                n_e2[2]=np.random.binomial(n_phPMT2[2],mu)            
+                # C/N
+                n_phPMT2CN = np.random.multinomial(n_ph2, dirichCN)
+                n_e2CN[0]=np.random.binomial(n_phPMT2CN[0],mu)
+                n_e2CN[1]=np.random.binomial(n_phPMT2CN[1],mu)
+            elif optionModel == "poisson":
+                n_e2[0] = np.random.poisson(sum(np.asarray(e_quenching2))*L*mu*dirichTD[0])
+                n_e2[1] = np.random.poisson(sum(np.asarray(e_quenching2))*L*mu*dirichTD[1])
+                n_e2[2] = np.random.poisson(sum(np.asarray(e_quenching2))*L*mu*dirichTD[2])
+                n_e2CN[0] = np.random.poisson(sum(np.asarray(e_quenching2))*L*mu*dirichCN[0])
+                n_e2CN[1] = np.random.poisson(sum(np.asarray(e_quenching2))*L*mu*dirichCN[1])           
+            else:
+                print("unknown model")        
+            
+                
             if sum(n_e2>1)>0: efficiency0_S +=1
             if sum(n_e2>1)>1: efficiency0_D +=1
             if sum(n_e2>1)>2: efficiency0_T +=1
             if n_e2[0]>1 and n_e2[1]>1: efficiency0_AB +=1 
             if n_e2[1]>1 and n_e2[2]>1: efficiency0_BC +=1 
             if n_e2[0]>1 and n_e2[2]>1: efficiency0_AC +=1
-            # C/N
-            n_phPMT2 = np.random.multinomial(n_ph2, dirichCN)
-            n_e2CN[0]=np.random.binomial(n_phPMT2[0],mu)
-            n_e2CN[1]=np.random.binomial(n_phPMT2[1],mu)            
             if sum(n_e2CN>1)>1: efficiency0_D2 +=1           
             
     else: # asym
-        Lm = np.mean(L)
-        n_ph = np.random.poisson(sum(np.asarray((e_quenching))*Lm/mu))
-        # TDCR
-        n_phPMT = np.random.multinomial(n_ph, [L[0]*dirichTD[0]/Lm, L[1]*dirichTD[1]/Lm, L[2]*dirichTD[2]/Lm])
-        n_e[0]=np.random.binomial(n_phPMT[0],mu)
-        n_e[1]=np.random.binomial(n_phPMT[1],mu)
-        n_e[2]=np.random.binomial(n_phPMT[2],mu)
+        if optionModel == "poisson-multinomial-binomial":
+            Lm = np.mean(L)
+            n_ph = np.random.poisson(sum(np.asarray((e_quenching))*Lm/mu))
+            # TDCR
+            n_phPMT = np.random.multinomial(n_ph, [L[0]*dirichTD[0]/Lm, L[1]*dirichTD[1]/Lm, L[2]*dirichTD[2]/Lm])
+            n_e[0]=np.random.binomial(n_phPMT[0],mu)
+            n_e[1]=np.random.binomial(n_phPMT[1],mu)
+            n_e[2]=np.random.binomial(n_phPMT[2],mu)
+            # C/N
+            n_phPMTCN = np.random.multinomial(n_ph, [L[0]/(2*Lm), L[1]/(2*Lm)])
+            n_eCN[0]=np.random.binomial(n_phPMTCN[0],mu)
+            n_eCN[1]=np.random.binomial(n_phPMTCN[1],mu)
+        elif optionModel == "poisson":
+            n_e[0] = np.random.poisson(sum(np.asarray(e_quenching))*L[0]*mu*dirichTD[0])
+            n_e[1] = np.random.poisson(sum(np.asarray(e_quenching))*L[1]*mu*dirichTD[1])
+            n_e[2] = np.random.poisson(sum(np.asarray(e_quenching))*L[2]*mu*dirichTD[2])
+            n_eCN[0] = np.random.poisson(sum(np.asarray(e_quenching))*L[0]*mu*dirichCN[0])
+            n_eCN[1] = np.random.poisson(sum(np.asarray(e_quenching))*L[1]*mu*dirichCN[1])           
+        else:
+            print("unknown model")        
+            
         if sum(n_e>1)>0: efficiency0_S =1
         if sum(n_e>1)>1: efficiency0_D =1
         if sum(n_e>1)>2: efficiency0_T =1
         if n_e[0]>1 and n_e[1]>1: efficiency0_AB =1 
         if n_e[1]>1 and n_e[2]>1: efficiency0_BC =1 
         if n_e[0]>1 and n_e[2]>1: efficiency0_AC =1
-        # C/N
-        n_phPMT = np.random.multinomial(n_ph, [L[0]/(2*Lm), L[1]/(2*Lm)])
-        n_eCN[0]=np.random.binomial(n_phPMT[0],mu)
-        n_eCN[1]=np.random.binomial(n_phPMT[1],mu)            
         if sum(n_eCN>1)>1: efficiency0_D2 =1       
         
         if evenement !=1 and t1 > extDT*1e-6 and t1 < measTime*60:
-            n_ph2 = np.random.poisson(sum(np.asarray(e_quenching2))*Lm/mu)
-            # TDCR
-            n_phPMT2 = np.random.multinomial(n_ph2, [L[0]*dirichCN[0]/Lm, L[1]*dirichCN[1]/Lm, L[2]*dirichCN[2]/Lm])
-            n_e2[0]=np.random.binomial(n_phPMT2[0],mu)
-            n_e2[1]=np.random.binomial(n_phPMT2[1],mu)
-            n_e2[2]=np.random.binomial(n_phPMT2[2],mu)     
+            if optionModel == "poisson-multinomial-binomial":
+                n_ph2 = np.random.poisson(sum(np.asarray(e_quenching2))*Lm/mu)
+                # TDCR
+                n_phPMT2 = np.random.multinomial(n_ph2, [L[0]*dirichCN[0]/Lm, L[1]*dirichCN[1]/Lm, L[2]*dirichCN[2]/Lm])
+                n_e2[0]=np.random.binomial(n_phPMT2[0],mu)
+                n_e2[1]=np.random.binomial(n_phPMT2[1],mu)
+                n_e2[2]=np.random.binomial(n_phPMT2[2],mu)
+                # C/N
+                n_phPMT2CN = np.random.multinomial(n_ph2, [L[0]/(2*Lm), L[1]/(2*Lm)])
+                n_e2CN[0]=np.random.binomial(n_phPMT2CN[0],mu)
+                n_e2CN[1]=np.random.binomial(n_phPMT2CN[1],mu)
+            elif optionModel == "poisson":
+                n_e2[0] = np.random.poisson(sum(np.asarray(e_quenching2))*L[0]*mu*dirichTD[0])
+                n_e2[1] = np.random.poisson(sum(np.asarray(e_quenching2))*L[1]*mu*dirichTD[1])
+                n_e2[2] = np.random.poisson(sum(np.asarray(e_quenching2))*L[2]*mu*dirichTD[2])
+                n_e2CN[0] = np.random.poisson(sum(np.asarray(e_quenching2))*L[0]*mu*dirichCN[0])
+                n_e2CN[1] = np.random.poisson(sum(np.asarray(e_quenching2))*L[1]*mu*dirichCN[1])           
+            else:
+                print("unknown model")   
+                
             if sum(n_e2>1)>0: efficiency0_S +=1
             if sum(n_e2>1)>1: efficiency0_D +=1
             if sum(n_e2>1)>2: efficiency0_T +=1
             if n_e2[0]>1 and n_e2[1]>1: efficiency0_AB +=1 
             if n_e2[1]>1 and n_e2[2]>1: efficiency0_BC +=1 
             if n_e2[0]>1 and n_e2[2]>1: efficiency0_AC +=1
-            # C/N
-            n_e2CN[0]=np.random.binomial(n_phPMT2[0],mu)
-            n_e2CN[1]=np.random.binomial(n_phPMT2[1],mu)            
             if sum(n_e2CN>1)>1: efficiency0_D2 +=1  
         
     return efficiency0_S, efficiency0_D, efficiency0_T, efficiency0_AB, efficiency0_BC, efficiency0_AC, efficiency0_D2         

tdcrpy/config.toml

@@ -36,6 +36,8 @@ fAq = 0.1
 alphaDir = 100000
 # Quantum efficiency
 effQuantum = 0.25
+# Optical MC model
+optionModel = poisson-multinomial-binomial
 
 ## PROPERTIES OF THE COUNTER
 # Coincidence resolving time (ns)

{tdcrpy-2.7.0.dist-info → tdcrpy-2.8.0.dist-info}/METADATA

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

{tdcrpy-2.7.0.dist-info → tdcrpy-2.8.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 tdcrpy/TDCRPy.py,sha256=VIwZJHtpjBt5e87KUqatCC6eTMr2sFVRl52LAc3PZq8,67850
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=lQXjfMj3QVyTkKatQ8-p7kny_d0UnVL9RkUtu-DMkQ8,133336
+tdcrpy/TDCR_model_lib.py,sha256=A48vTVqIVaAslYqE41b15Q_hsMpN5rNQZOf3JVNK6e0,136503
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=9Djir8dPNchcJVQvhl-oRHEOsoDkiZlkOhWT-eHR7wQ,95
-tdcrpy/config.toml,sha256=UY_7VufbsR_Gcr8QrkqO1yD_SToDpCgXnXOcom_gz5k,1572
+tdcrpy/config.toml,sha256=Yg-MBlzxOYiovgVFWq6VtivPkzwyNeWBzwNTc7ADYkU,1634
 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
@@ -74,8 +74,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-2.7.0.dist-info/licenses/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-tdcrpy-2.7.0.dist-info/METADATA,sha256=JYJHZl5WSsV-TJ5ckJo99WEWzNKaMm14QwedpunQs54,45298
-tdcrpy-2.7.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-tdcrpy-2.7.0.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-tdcrpy-2.7.0.dist-info/RECORD,,
+tdcrpy-2.8.0.dist-info/licenses/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+tdcrpy-2.8.0.dist-info/METADATA,sha256=DC9TjSh3dw67Jh_F9xMOjXUZAOgF5pyL8Rp7ClBeOzo,45298
+tdcrpy-2.8.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+tdcrpy-2.8.0.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+tdcrpy-2.8.0.dist-info/RECORD,,