TDCRPy 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

{TDCRPy-0.0.36.dist-info → TDCRPy-0.0.38.dist-info}/METADATA

@@ -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.dist-info → TDCRPy-0.0.38.dist-info}/RECORD

@@ -1,7 +1,7 @@
 tdcrpy/Activity_TDCR.py,sha256=wcllEOJbeEOexAYzcFGQx2luIBhxSU3LtpEalRmNziw,11530
 tdcrpy/EfficiencyProfils.py,sha256=-ZUPva1dU7lMRcKbQAewX9QyiTDwCiNQDoaQiw7dOI4,4829
-tdcrpy/TDCRPy.py,sha256=Dp4HXT1lwITG3SDjAUzWfeZBCTUA73qhgI95cXplOnM,25881
-tdcrpy/TDCR_model_lib.py,sha256=_quRzWVhfdnArH4NE6GQODoPwO9Mt7vgJNyo2H1JZtw,83897
+tdcrpy/TDCRPy.py,sha256=6-N5vpsf0cKGcXYiTfmmk_HXpoHYU7rD1qb4lHJDtv4,25906
+tdcrpy/TDCR_model_lib.py,sha256=AXxEdg0kIvRXZ0VUwZ8HrgW-pWnM8Nralp_r8GmkIZ8,83907
 tdcrpy/TDCRoptimize.py,sha256=7S2HAXNLpWPdV4GjVk1C4E8KOraOjtmr2bWC1bzuSzg,3068
 tdcrpy/__init__.py,sha256=DrgMGzw5vhdxbXvJq3orzdPeFaq8CwtDHzssp1_DqhM,93
 tdcrpy/config.toml,sha256=y-Ii97oy4n7X8FEWyPPVQimxqnjqjlFUwihD7hPPsgg,151
@@ -21,8 +21,8 @@ tdcrpy/Quenching/alpha_toulene.txt,sha256=3aIOCC1h19z8E0JZ2_MaSWRWcdnr-mtmT4qEF6
 tdcrpy/decayData/All-nuclides_BetaShape.zip,sha256=ZBeaOUBO09gKGD6ouUXNW5UzdHavTKN5cACTqPqA-KU,6507983
 tdcrpy/decayData/All-nuclides_Ensdf.zip,sha256=LVNNlE_akrg0T-N-7puMuGAme4JRzg-D1YaOwXpiIvg,424716
 tdcrpy/decayData/All-nuclides_PenNuc.zip,sha256=DmhS2CYegWhL8qggc_MO6FgyiXE5qX73dOoH-SSQXoo,388954
-TDCRPy-0.0.36.dist-info/LICENCE.md,sha256=fuYzrZRiOAjJBzA1tsGQwojCgGROArb2Ec48GDTjlWM,1086
-TDCRPy-0.0.36.dist-info/METADATA,sha256=C35WOWktqbwqmeSyCRBFmAthut7v-CR5OWZYPNJbup8,5633
-TDCRPy-0.0.36.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-TDCRPy-0.0.36.dist-info/top_level.txt,sha256=VgPJa9YJ7fi8wrr9qDJPLhu3tK1BcFRIP6Ib4r3BEfs,7
-TDCRPy-0.0.36.dist-info/RECORD,,
+TDCRPy-0.0.38.dist-info/LICENCE.md,sha256=fuYzrZRiOAjJBzA1tsGQwojCgGROArb2Ec48GDTjlWM,1086
+TDCRPy-0.0.38.dist-info/METADATA,sha256=IWu7kqjPNQ77P5LRRFuuOulDZjI46ZPGfNo4idYswMU,5633
+TDCRPy-0.0.38.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+TDCRPy-0.0.38.dist-info/top_level.txt,sha256=VgPJa9YJ7fi8wrr9qDJPLhu3tK1BcFRIP6Ib4r3BEfs,7
+TDCRPy-0.0.38.dist-info/RECORD,,

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/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