TDCRPy 0.0.36__tar.gz → 0.0.38__tar.gz

{TDCRPy-0.0.36/TDCRPy.egg-info → TDCRPy-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 0.0.36
+Version: 0.0.38
 Summary: TDCR model
 Home-page: https://github.com/RomainCoulon/TDCRPy
 Author: RomainCoulon (Romain Coulon)

{TDCRPy-0.0.36 → TDCRPy-0.0.38/TDCRPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 0.0.36
+Version: 0.0.38
 Summary: TDCR model
 Home-page: https://github.com/RomainCoulon/TDCRPy
 Author: RomainCoulon (Romain Coulon)

{TDCRPy-0.0.36 → TDCRPy-0.0.38}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = "0.0.36"
+VERSION = "0.0.38"
 DESCRIPTION = "TDCR model"
 
 with open("README.md", "r") as f:

{TDCRPy-0.0.36 → TDCRPy-0.0.38}/tdcrpy/TDCRPy.py

@@ -332,6 +332,8 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, mode, mode2, Displa
             Calculation of the scintillation quenching with the Birks Model
             ====================
             '''
+            if Display: print("\t Summary of the estimation of quenched energies")
+            if Display: print("\t\t energy_vec      : ", energy_vec, "keV")
             e_quenching=[]
             for i, p in enumerate(particle_vec):
                 e_discrete = np.linspace(0,energy_vec[i],nE) # vector for the quenched  energy calculation keV
@@ -344,9 +346,6 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, mode, mode2, Displa
                     e_quenching.append(energy_vec[i])
                 else:
                     e_quenching.append(0)
-            if Display: print("\t Summary of the estimation of quenched energies")
-            
-            if Display: print("\t\t energy_vec      : ", energy_vec, "keV")
             if Display: print("\t\t quenched energy : ", e_quenching, "keV")
     
             '''
@@ -364,7 +363,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, mode, mode2, Displa
                 if Display: print("\t Summary of TDCR measurement")
                 if Display: print("\t\t Efficiency of single events: ", efficiency_S[-1])
                 if Display: print("\t\t Efficiency of double events: ", efficiency_D[-1])
-                if Display: print("\t\t Efficiency of triple events: ", efficiency_D[-1])
+                if Display: print("\t\t Efficiency of triple events: ", efficiency_T[-1])
             elif mode2=="asym":
                 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
@@ -390,6 +389,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, mode, mode2, Displa
         '''
         if mode2=="sym":
             mean_efficiency_T = np.mean(efficiency_T) # average
+            print(efficiency_T[:100])
             std_efficiency_T = np.std(efficiency_T)/np.sqrt(N)   # standard deviation
             mean_efficiency_D = np.mean(efficiency_D)
             std_efficiency_D = np.std(efficiency_D)/np.sqrt(N)

{TDCRPy-0.0.36 → TDCRPy-0.0.38}/tdcrpy/TDCR_model_lib.py

@@ -1858,6 +1858,7 @@ def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,mode,mode2,ne):
     for i, ei in enumerate(e): 
         em[i] = E_quench_e(ei*1e3,kB*1e3,ne)*1e-3
         
+        
     if mode2=="sym":
         eff_S = sum(p*(1-np.exp(-L*em/3)))
         eff_T = eff_S**3