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

tdcrpy/TDCR_model_lib.py

@@ -61,6 +61,7 @@ def readParameters(disp=False):
     fAq = config["Inputs"].getfloat("fAq")
     micCorr = config["Inputs"].getboolean("micCorr")
     alphaDir = config["Inputs"].getfloat("alphaDir")
+    effQuantic = config["Inputs"].getfloat("effQuantum")
     
     if disp:
         print(f"number of integration bins for electrons = {nE_electron}")
@@ -78,13 +79,14 @@ def readParameters(disp=False):
         print(f"diameter of micelle = {diam_micelle} nm")
         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"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, 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, 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, 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, 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) 
@@ -200,6 +202,12 @@ def modifyAlphaDir(x):
     x0 = readParameters()[14]
     data1 = data0.replace(f"alphaDir = {x0}",f"alphaDir = {x}")
     writeConfifAsstr(data1)
+    
+def modifyEffQ(x):
+    data0 = readConfigAsstr()
+    x0 = readParameters()[15]
+    data1 = data0.replace(f"effQuantum = {x0}",f"effQuantum = {x}")
+    writeConfifAsstr(data1)
 
 def read_temp_files(copy=False, path="C:"):
     
@@ -3012,7 +3020,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):
+def detectProbabilitiesMC(L, e_quenching, e_quenching2, t1, evenement, extDT, measTime, dir_param = alphaDir, effQuantic = effQuantic):
     """
     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 
 
@@ -3056,7 +3064,7 @@ def detectProbabilitiesMC(L, e_quenching, e_quenching2, t1, evenement, extDT, me
     else:
         symm = True
     
-    mu = 0.2
+    mu = effQuantic
     
     if dir_param < 1000:
         dirichTD = np.random.dirichlet([dir_param, dir_param, dir_param])

tdcrpy/config.toml

@@ -34,6 +34,8 @@ fAq = 0.1
 ## OPTICAL PROPERTIES
 # Dirichlet parameter
 alphaDir = 100000
+# Quantum efficiency
+effQuantum = 0.25
 
 ## PROPERTIES OF THE COUNTER
 # Coincidence resolving time (ns)

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

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

{tdcrpy-2.6.0.dist-info → tdcrpy-2.7.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=ovXYDrVcoH6Mbs1l0i8c25Qt2AVOK0zhcNWNP84eAgo,132970
+tdcrpy/TDCR_model_lib.py,sha256=lQXjfMj3QVyTkKatQ8-p7kny_d0UnVL9RkUtu-DMkQ8,133336
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=9Djir8dPNchcJVQvhl-oRHEOsoDkiZlkOhWT-eHR7wQ,95
-tdcrpy/config.toml,sha256=-9LbdX_d2mPd9O5OCiHlYN-FhQ83DPvOGrlQKPu7BxU,1533
+tdcrpy/config.toml,sha256=UY_7VufbsR_Gcr8QrkqO1yD_SToDpCgXnXOcom_gz5k,1572
 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.6.0.dist-info/licenses/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-tdcrpy-2.6.0.dist-info/METADATA,sha256=E5H_WbO9TYi9zrdfQekJboB4oW7l4twjUzPgw-cQ8Tg,45298
-tdcrpy-2.6.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-tdcrpy-2.6.0.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-tdcrpy-2.6.0.dist-info/RECORD,,
+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,,