TDCRPy 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

{TDCRPy-1.2.0.dist-info → TDCRPy-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 1.2.0
+Version: 1.4.0
 Summary: TDCR model
 Home-page: https://github.com/RomainCoulon/TDCRPy
 Author: RomainCoulon (Romain Coulon)
@@ -25,6 +25,7 @@ Requires-Dist: setuptools
 Requires-Dist: scipy
 Requires-Dist: configparser
 Requires-Dist: importlib.resources
+Requires-Dist: matplotlib
 
 # TDCRPy
 

{TDCRPy-1.2.0.dist-info → TDCRPy-1.4.0.dist-info}/RECORD

@@ -1,5 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=nIwQQTkwHCAEueOb9CdBfNxS_AwpkwLF896gXY_75k8,49726
-tdcrpy/TDCR_model_lib.py,sha256=ntATaZ0HxYohWa4r98yjG-8CRbJSb9cQ465a1_JeA1o,65661
+tdcrpy/TDCRPy.py,sha256=quadaBgbdES_TJIm5nwkurXlu0cWAEVaxpoEpTCXTJI,57594
+tdcrpy/TDCRPy1.py,sha256=jtY1CUZ2eaFjTVjU5IBzL3yixq5BoAIw2YJZhfvO0jA,57562
+tdcrpy/TDCR_model_lib.py,sha256=eWD4jp8Bh1ytRJmzCNkJlbco4aQOIN1ZB3iWYlutxo8,67711
 tdcrpy/TDCRoptimize.py,sha256=ab1EzTNm2HALwKopitwX0BAS8v0pEgAXnye4NOUBazc,3132
 tdcrpy/__init__.py,sha256=pxZ5gMTFSEzeGQLzeRjy-Imu7bZIfhg9eqloOq5FTM4,130
 tdcrpy/config.toml,sha256=P46cM2uvxD5NgcVK0J6zE2kFnh5AmAww5CMgxgtWCKE,1541
@@ -60,8 +61,8 @@ tdcrpy/docs/_build/html/source/modules.html,sha256=gJrhuEaMQHkYGewGHPWGmgVsPgVV6
 tdcrpy/docs/_build/html/source/tdcrpy.html,sha256=VZV_LFdrCCIvYBXzsZE9mZx8iGa7ZjhEsXtE8BqqU9g,90373
 tdcrpy/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tdcrpy/test/test_tdcrpy.py,sha256=dWZpfvarkr8lr_K_zUakt2AOcF0FfCOjBOQPl4vnTWc,4116
-TDCRPy-1.2.0.dist-info/LICENCE.md,sha256=fuYzrZRiOAjJBzA1tsGQwojCgGROArb2Ec48GDTjlWM,1086
-TDCRPy-1.2.0.dist-info/METADATA,sha256=axzuQOJ8DQgmLBzDj_otdu4B7zo6EWZvaEJ1p-quI24,15902
-TDCRPy-1.2.0.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-TDCRPy-1.2.0.dist-info/top_level.txt,sha256=VgPJa9YJ7fi8wrr9qDJPLhu3tK1BcFRIP6Ib4r3BEfs,7
-TDCRPy-1.2.0.dist-info/RECORD,,
+TDCRPy-1.4.0.dist-info/LICENCE.md,sha256=fuYzrZRiOAjJBzA1tsGQwojCgGROArb2Ec48GDTjlWM,1086
+TDCRPy-1.4.0.dist-info/METADATA,sha256=mOrS7wJUGlmoWmHB4sczPRD2i31mtNvW_V8yy3KjBkg,15929
+TDCRPy-1.4.0.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+TDCRPy-1.4.0.dist-info/top_level.txt,sha256=VgPJa9YJ7fi8wrr9qDJPLhu3tK1BcFRIP6Ib4r3BEfs,7
+TDCRPy-1.4.0.dist-info/RECORD,,

tdcrpy/TDCRPy.py

@@ -12,11 +12,12 @@ Bureau International des Poids et Mesures
 # import tdcrpy.TDCR_model_lib as tl
 import TDCR_model_lib as tl
 import importlib.resources
+from importlib.resources import files
 import configparser
 import numpy as np
 from tqdm import tqdm
 
-def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=False, barp=False):
+def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=False, barp=False,uncData=False):
     """
     This is the main function of the TDCRPy package running the Monte-Carlo Triple-to-Double Coincidence Ratio model.
     The computation is made for a given solution containing a radionuclide (or a mixture of radionuclides), a given volume of scintillator V and a given Birks constant kB. 
@@ -95,7 +96,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
     """
     if barp: tl.display_header()
     config = configparser.ConfigParser()
-    with importlib.resources.path('tdcrpy', 'config.toml') as data_path:
+    with importlib.resources.as_file(files('tdcrpy').joinpath('config.toml')) as data_path:
         file_conf = data_path       
     config.read(file_conf)
     tau=config["Inputs"].getfloat("tau")
@@ -174,9 +175,15 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
         efficiency_S = []
         efficiency_D = []
         efficiency_T = []
+        efficiency_S2 = []
+        efficiency_D2 = []
+        efficiency_T2 = []
         efficiency_AB = []
         efficiency_BC = []
         efficiency_AC = []
+        efficiency_AB2 = []
+        efficiency_BC2 = []
+        efficiency_AC2 = []
         
         if barp and not Display: NN = tqdm(range(N), desc="Processing", unit=" decays")
         else: NN = range(N)
@@ -223,8 +230,9 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                     print("\t Sampled decay branch:")
                     if particle_branch[:4]=="Atom":
                         if particle_branch=="Atom_K": print("\t\t Electron capture on K shell")
-                        if particle_branch=="Atom_L": print("\t\t Electron capture on L shell")
+                        if particle_branch=="Atom_L" or particle_branch=="Atom_L1" or particle_branch=="Atom_L2" or particle_branch=="Atom_L3": print("\t\t Electron capture on L shell")
                         if particle_branch=="Atom_M": print("\t\t Electron capture on M shell")
+                        if particle_branch=="Atom_O": print("\t\t Electron capture on O shell")
                     else:
                         print("\t\t Particle: ", particle_branch)
                         print("\t\t Energy of the particle = ", energy_branch, " keV")
@@ -251,18 +259,34 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
             ==============
             '''  
             if Display: print("\t Subsequent isomeric transition(s)")                       # finish with the mother / now with the daughter
+            evenement = 1
+            e_sum2 = 0
+            particle_vec2 = []
+            energy_vec2 = []
             while levelOftheDaughter > 0:                                                # Go on the loop while the daughter nucleus is a its fundamental level (energy 0)
                 i_level = levelNumber[index_rad][iDaughter].index([levelOftheDaughter])  # Find the position in the daughter level vector
                 
+                t1 = np.random.exponential(trans_halfLife[index_rad][iDaughter][i_level][0], size=1)[0]
+
                 # test whether the decay occurs within the coincidence resolving time or not
-                if np.random.exponential(trans_halfLife[index_rad][iDaughter][i_branch][i_level], size=1)[0] > tau: splitEvent = True
-                else: splitEvent = False
+                if t1 > tau*1e-9: 
+                    #splitEvent = True
+                    evenement = evenement + 1
                                 
                 if transitionType[index_rad][iDaughter][i_level] != []:
                     #====================================================================
                     # Sampling of the transition in energy levels of the daughter nucleus
                     #====================================================================
-                    probability_tran = tl.normalise(prob_trans[index_rad][iDaughter][i_level])   # normaliser la proba de transition 
+                    
+                    if uncData:
+                        prob_trans_s=[]
+                        for ipt, xpt in enumerate(prob_trans[index_rad][iDaughter][i_level]):
+                            prob_trans_s.append(np.random.normal(xpt, u_prob_trans[index_rad][iDaughter][i_level][ipt], 1)[0])
+                            
+                        probability_tran = tl.normalise(prob_trans_s)   # normaliser la proba de transition
+                    else:
+                        probability_tran = tl.normalise(prob_trans[index_rad][iDaughter][i_level])   # normaliser la proba de transition 
+                    #probability_tran = tl.normalise(prob_trans[index_rad][iDaughter][i_level])   # normaliser la proba de transition 
                     index_t = tl.sampling(probability_tran)                                      # indice de la transition
                     if Display:
                         print("\t\t Energy of the level = ", levelEnergy[index_rad][iDaughter][i_level][0], " keV")
@@ -279,62 +303,111 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                     #========
                     # Scoring
                     #========
-                    if transitionType[index_rad][iDaughter][i_level][index_t] == "GA":            # if it is a gamma that has been emitted
-                        particle_vec.append("gamma")                                              # Update of the particle vector
-                        energy_vec.append(e_trans[index_rad][iDaughter][i_level][index_t])        # Update the energy vector
-                    else:                                                                         # if not, it is a internal conversion, so an electron
-                        particle_vec.append("electron")                                           # !!!!!!!!! it is OK for our model? Does the electron leave with the kinetic enegy of the transition 
-                        energy_vec.append(e_trans[index_rad][iDaughter][i_level][index_t])        # Update the energy vector
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EK":        # record that an electron is missing on the K shell of the dughter nucleus
-                            particle_vec.append("Atom_K")
-                            energy_vec.append(0)
-    
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EL":       # record that an electron is missing on the L1 shell of the dughter nucleus
-                            particle_vec.append("Atom_L")
-                            energy_vec.append(0)
-    
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EL1":       # record that an electron is missing on the L1 shell of the dughter nucleus
-                            particle_vec.append("Atom_L1")
-                            energy_vec.append(0)
-    
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EL2":       # record that an electron is missing on the L2 shell of the dughter nucleus
-                            particle_vec.append("Atom_L2")
-                            energy_vec.append(0)
-    
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EL3":       # record that an electron is missing on the L3 shell of the dughter nucleus
-                            particle_vec.append("Atom_L3")
-                            energy_vec.append(0)
-    
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EM":        # record that an electron is missing on the M shell of the dughter nucleus
-                            particle_vec.append("Atom_M")
-                            energy_vec.append(0)
-    
-                        if transitionType[index_rad][iDaughter][i_level][index_t] == "EN":        # record that an electron is missing on the N shell of the dughter nucleus
-                            particle_vec.append("Atom_N")
-                            energy_vec.append(0)
+                    
+                    ## evenement retardé
+                    if evenement != 1:
+                        if transitionType[index_rad][iDaughter][i_level][index_t] == "GA":            # if it is a gamma that has been emitted
+                            particle_vec2.append("gamma")                                              # Update of the particle vector
+                            energy_vec2.append(e_trans[index_rad][iDaughter][i_level][index_t])        # Update the energy vector
+                        else:                                                                         # if not, it is a internal conversion, so an electron
+                            particle_vec2.append("electron")                                           # !!!!!!!!! it is OK for our model? Does the electron leave with the kinetic enegy of the transition 
+                            energy_vec2.append(e_trans[index_rad][iDaughter][i_level][index_t])        # Update the energy vector
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EK":        # record that an electron is missing on the K shell of the dughter nucleus
+                                particle_vec2.append("Atom_K")
+                                energy_vec2.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL":       # record that an electron is missing on the L1 shell of the dughter nucleus
+                                particle_vec2.append("Atom_L")
+                                energy_vec2.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL1":       # record that an electron is missing on the L1 shell of the dughter nucleus
+                                particle_vec2.append("Atom_L1")
+                                energy_vec2.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL2":       # record that an electron is missing on the L2 shell of the dughter nucleus
+                                particle_vec2.append("Atom_L2")
+                                energy_vec2.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL3":       # record that an electron is missing on the L3 shell of the dughter nucleus
+                                particle_vec2.append("Atom_L3")
+                                energy_vec2.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EM":        # record that an electron is missing on the M shell of the dughter nucleus
+                                particle_vec2.append("Atom_M")
+                                energy_vec2.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EN":        # record that an electron is missing on the N shell of the dughter nucleus
+                                particle_vec2.append("Atom_N")
+                                energy_vec2.append(0)
+                        e_sum2 += e_trans[index_rad][iDaughter][i_level][index_t]                      # Energy summary  
+                    
+                    
+                    ## evenement normal    
+                    else:
+                        if transitionType[index_rad][iDaughter][i_level][index_t] == "GA":            # if it is a gamma that has been emitted
+                            particle_vec.append("gamma")                                              # Update of the particle vector
+                            energy_vec.append(e_trans[index_rad][iDaughter][i_level][index_t])        # Update the energy vector
+                        else:                                                                         # if not, it is a internal conversion, so an electron
+                            particle_vec.append("electron")                                           # !!!!!!!!! it is OK for our model? Does the electron leave with the kinetic enegy of the transition 
+                            energy_vec.append(e_trans[index_rad][iDaughter][i_level][index_t])        # Update the energy vector
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EK":        # record that an electron is missing on the K shell of the dughter nucleus
+                                particle_vec.append("Atom_K")
+                                energy_vec.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL":       # record that an electron is missing on the L1 shell of the dughter nucleus
+                                particle_vec.append("Atom_L")
+                                energy_vec.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL1":       # record that an electron is missing on the L1 shell of the dughter nucleus
+                                particle_vec.append("Atom_L1")
+                                energy_vec.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL2":       # record that an electron is missing on the L2 shell of the dughter nucleus
+                                particle_vec.append("Atom_L2")
+                                energy_vec.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EL3":       # record that an electron is missing on the L3 shell of the dughter nucleus
+                                particle_vec.append("Atom_L3")
+                                energy_vec.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EM":        # record that an electron is missing on the M shell of the dughter nucleus
+                                particle_vec.append("Atom_M")
+                                energy_vec.append(0)
+        
+                            if transitionType[index_rad][iDaughter][i_level][index_t] == "EN":        # record that an electron is missing on the N shell of the dughter nucleus
+                                particle_vec.append("Atom_N")
+                                energy_vec.append(0)
+                        e_sum += e_trans[index_rad][iDaughter][i_level][index_t]                      # Energy summary
                             
-                    e_sum += e_trans[index_rad][iDaughter][i_level][index_t]                      # Energy summary
+                    
+                    
                     levelOftheDaughter = next_level[index_rad][iDaughter][i_level][index_t]       # set the next level
+                
                 else:
                     i_level = levelNumber[index_rad][iDaughter].index([levelOftheDaughter])
                     print("warning:pas de données de transition:daughter,niveau,niveau d'énergie",DaughterVec[index_rad][iDaughter],levelOftheDaughter,levelEnergy[index_rad][iDaughter][i_level] )
                     levelOftheDaughter = 0   # set the next level
                     
             if Display:
-                print("\t Summary of the nuclear decay")
+                print("\t Summary of the nuclear promt decay")
                 for i, p in enumerate(particle_vec):
                     if p[:4] != "Atom":
+                        print('particle :',p)
                         print(f"\t\t energy of {p} = ", energy_vec[i]," keV")
+                if evenement != 1:
+                    print("\t Summary of the nuclear delayed decay")
+                    for i, p in enumerate(particle_vec2):
+                        if p[:4] != "Atom":
+                            print('particle :',p)
+                            print(f"\t\t energy of {p} = ", energy_vec2[i]," keV")
     
             '''
             ==========================
             II. LA RELAXATION ATOMIQUE
             ==========================
             '''
-            
-            if splitEvent:
-                particle_vec2=[]
-                energy_vec2=[]
+            ## evenement retarde
+            if evenement != 1:
                 
                 daughter_relax = DaughterVec[index_rad][iDaughter]
                 for i_part in range(len(particle_vec)):
@@ -345,35 +418,77 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                         tf,ef = tl.relaxation_atom(daughter_relax,Rad[index_rad],particle_vec[i_part])
                         if tf == "XKA":
                             particle_vec[i_part] = "Atom_L"
+                            particle_vec.append(tf)
+                            energy_vec.append(ef)
+                            relaxation = True
+                        elif tf == "XKB":
+                            particle_vec[i_part] = "Atom_M"
+                            particle_vec.append(tf)
+                            energy_vec.append(ef)
+                            relaxation = False
+                        elif tf == "XL":
+                            particle_vec[i_part] = "Atom_M"
+                            particle_vec.append(tf)
+                            energy_vec.append(ef)
+                            relaxation = False
+                        elif tf == "Auger K":
+                            particle_vec[i_part] = "Atom_L"
+                            particle_vec.append(tf)
+                            energy_vec.append(ef)
+                            relaxation = True
+                        elif tf == "Auger L":
+                            particle_vec[i_part] = "Atom_M"
+                            particle_vec.append(tf)
+                            energy_vec.append(ef)
+                            relaxation = False
+                        else:
+                            if Display: print("untermined x or Auger")
+                            relaxation = False
+                        e_sum += ef
+                if Display:
+                    print("\t Summary of the atomic relaxation (promt emission)")
+                    for i, p in enumerate(particle_vec):
+                        if p[:4] != "Atom":
+                            print(f"\t\t energy of {p} = ", round(energy_vec[i],3), "keV")
+                            
+                for i_part in range(len(particle_vec2)):
+                    relaxation = False
+                    if "Atom_K" in particle_vec2[i_part] or "Atom_L" in particle_vec2[i_part] or "Atom_M" in particle_vec2[i_part]:
+                        relaxation = True
+                    while relaxation:
+                        tf,ef = tl.relaxation_atom(daughter_relax,Rad[index_rad],particle_vec2[i_part])
+                        if tf == "XKA":
+                            particle_vec2[i_part] = "Atom_L"
                             particle_vec2.append(tf)
                             energy_vec2.append(ef)
                             relaxation = True
                         elif tf == "XKB":
-                            particle_vec[i_part] = "Atom_M"
+                            particle_vec2[i_part] = "Atom_M"
                             particle_vec2.append(tf)
                             energy_vec2.append(ef)
                             relaxation = False
                         elif tf == "XL":
-                            particle_vec[i_part] = "Atom_M"
+                            particle_vec2[i_part] = "Atom_M"
                             particle_vec2.append(tf)
                             energy_vec2.append(ef)
                             relaxation = False
                         elif tf == "Auger K":
-                            particle_vec[i_part] = "Atom_L"
+                            particle_vec2[i_part] = "Atom_L"
                             particle_vec2.append(tf)
                             energy_vec2.append(ef)
                             relaxation = True
                         elif tf == "Auger L":
-                            particle_vec[i_part] = "Atom_M"
+                            particle_vec2[i_part] = "Atom_M"
                             particle_vec2.append(tf)
                             energy_vec2.append(ef)
                             relaxation = False
                         else:
                             if Display: print("untermined x or Auger")
                             relaxation = False
-                        e_sum += ef
+                        e_sum2 += ef
+                
                 if Display:
-                    print("\t Summary of the atomic relaxation (prompt emission)")
+                    print("\t Summary of the atomic relaxation (delayed emission)")
                     for i, p in enumerate(particle_vec2):
                         if p[:4] != "Atom":
                             print(f"\t\t energy of {p} = ", round(energy_vec2[i],3), "keV")
@@ -395,14 +510,14 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                         e_b,p_b = tl.readBetaShape(rad_i,"beta+",level_before_trans)
                         index_beta_energy = tl.sampling(p_b)
                         particle_vec2[i] = "positron"
-                        energy_vec[i] = e_b[index_beta_energy]
+                        energy_vec2[i] = e_b[index_beta_energy]
                         particle_vec2.append("gamma")
                         particle_vec2.append("gamma")
                         energy_vec2.append(511)
                         energy_vec2.append(511)
                 energy_vec_initial2 = energy_vec2    
                 if Display:
-                    print("\t Summary of emitted particles from the promt atomic relaxation")
+                    print("\t Summary of emitted particles from the delayed atomic relaxation")
                     for i, p in enumerate(particle_vec2):
                         if p[:4] != "Atom": print(f"\t\t energy of {p} = ", round(energy_vec2[i],3), "keV")
                 
@@ -425,7 +540,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                         energy_vec.append(511)
                 energy_vec_initial = energy_vec    
                 if Display:
-                    print("\t Summary of emitted particles from the delayed nuclear relaxation")
+                    print("\t Summary of emitted particles from the promt nuclear relaxation")
                     for i, p in enumerate(particle_vec):
                         if p[:4] != "Atom": print(f"\t\t energy of {p} = ", round(energy_vec[i],3), "keV")
     
@@ -452,7 +567,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                         energy_vec2[i] = tl.energie_dep_beta(energy_vec2[i])
                         
                 if Display:
-                    print("\t Summary of the energy deposited by charged particles by the prompt atomic relaxation")
+                    print("\t Summary of the energy deposited by charged particles by the delayed atomic relaxation")
                     for i, p  in enumerate(particle_vec2):
                         if p[:4] != "Atom": print(f"\t\t energy of {p} = ", round(energy_vec2[i],3), "keV")
                 
@@ -473,7 +588,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                         energy_vec[i] = tl.energie_dep_beta(energy_vec[i])
                         
                 if Display:
-                    print("\t Summary of the energy deposited by charged particles from the delayed nuclear relaxation")
+                    print("\t Summary of the energy deposited by charged particles from the prompt nuclear relaxation")
                     for i, p  in enumerate(particle_vec):
                         if p[:4] != "Atom": print(f"\t\t energy of {p} = ", round(energy_vec[i],3), "keV")
                 
@@ -483,7 +598,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                 Calculation of the scintillation quenching with the Birks Model
                 ====================
                 '''
-                if Display: print("\t Summary of the estimation of quenched energies by the prompt atomic relaxation")
+                if Display: print("\t Summary of the estimation of quenched energies by the delayed atomic relaxation")
                 e_quenching2=[]
                 for i, p in enumerate(particle_vec2):
                     if p == "alpha":
@@ -501,7 +616,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                 
                 
                 # changer l'intégration E_i - E_d à E_i
-                if Display: print("\t Summary of the estimation of quenched energies from the delayed nuclear relaxation")
+                if Display: print("\t Summary of the estimation of quenched energies from the prompt nuclear relaxation")
                 e_quenching=[]
                 for i, p in enumerate(particle_vec):
                     if p == "alpha":
@@ -524,7 +639,18 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                 '''
                 
                 if mode2=="sym":
-                    p_nosingle = np.exp(-L*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
+                    p_nosingle2 = np.exp(-L*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
+                    p_single2 = 1-p_nosingle2                                    # probability to have at least 1 electrons in a PMT
+                    efficiency_S2.append(p_single2)
+                    efficiency_T2.append(p_single2**3)
+                    efficiency_D2.append(3*(p_single2)**2-2*efficiency_T2[-1])
+                    if Display: print("\t Summary of TDCR measurement (delayed)")
+                    if Display: print("\t\t Free parameter = ", L, "keV-1")
+                    if Display: print("\t\t Efficiency of single events = ", round(efficiency_S2[-1],5))
+                    if Display: print("\t\t Efficiency of double events = ", round(efficiency_D2[-1],5))
+                    if Display: print("\t\t Efficiency of triple events = ", round(efficiency_T2[-1],5))
+                    
+                    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
                     efficiency_S.append(p_single)
                     efficiency_T.append(p_single**3)
@@ -534,41 +660,30 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                     if Display: print("\t\t Efficiency of single events = ", round(efficiency_S[-1],5))
                     if Display: print("\t\t Efficiency of double events = ", round(efficiency_D[-1],5))
                     if Display: print("\t\t Efficiency of triple events = ", round(efficiency_T[-1],5))
+                    
                 elif mode2=="asym":
-                    pA_nosingle = np.exp(-L[0]*np.sum(np.asarray(e_quenching2))/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_quenching2))/3) # probability to have 0 electrons in a PMT
-                    pB_single = 1-pB_nosingle                                    # probability to have at least 1 electrons in a PMT
-                    pC_nosingle = np.exp(-L[2]*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
-                    pC_single = 1-pC_nosingle                                    # probability to have at least 1 electrons in a PMT
+                    pA_nosingle2 = np.exp(-L[0]*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
+                    pA_single2 = 1-pA_nosingle2                                    # probability to have at least 1 electrons in a PMT
+                    pB_nosingle2 = np.exp(-L[1]*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
+                    pB_single2 = 1-pB_nosingle2                                    # probability to have at least 1 electrons in a PMT
+                    pC_nosingle2 = np.exp(-L[2]*np.sum(np.asarray(e_quenching2))/3) # probability to have 0 electrons in a PMT
+                    pC_single2 = 1-pC_nosingle2                                    # probability to have at least 1 electrons in a PMT
                     
-                    efficiency_AB.append(pA_single*pB_single)
-                    efficiency_BC.append(pB_single*pC_single)
-                    efficiency_AC.append(pA_single*pC_single)
-                    efficiency_T.append(pA_single*pB_single*pC_single)
-                    efficiency_D.append(efficiency_AB[-1]+efficiency_BC[-1]+efficiency_AC[-1]-2*efficiency_T[-1])
-                    efficiency_S.append(pA_single+pB_single+pC_single-efficiency_D[-1]-efficiency_T[-1])
-                    if Display: print("\t Summary of TDCR measurement (prompt)")
+                    efficiency_AB2.append(pA_single2*pB_single2)
+                    efficiency_BC2.append(pB_single2*pC_single2)
+                    efficiency_AC2.append(pA_single2*pC_single2)
+                    efficiency_T2.append(pA_single2*pB_single2*pC_single2)
+                    efficiency_D2.append(efficiency_AB2[-1]+efficiency_BC2[-1]+efficiency_AC2[-1]-2*efficiency_T2[-1])
+                    efficiency_S2.append(pA_single2+pB_single2+pC_single2-efficiency_D2[-1]-efficiency_T2[-1])
+                    if Display: print("\t Summary of TDCR measurement (delayed)")
                     if Display: print("\t\t Free parameter PMT A: ", L[0], "keV-1")
                     if Display: print("\t\t Free parameter PMT B: ", L[1], "keV-1")
                     if Display: print("\t\t Free parameter PMT C: ", L[2], "keV-1")
-                    if Display: print("\t\t Efficiency of single events: ", round(efficiency_S[-1],5))
-                    if Display: print("\t\t Efficiency of double events: ", round(efficiency_D[-1],5))
-                    if Display: print("\t\t Efficiency of triple events: ", round(efficiency_T[-1],5))
-                
+                    if Display: print("\t\t Efficiency of single events: ", round(efficiency_S2[-1],5))
+                    if Display: print("\t\t Efficiency of double events: ", round(efficiency_D2[-1],5))
+                    if Display: print("\t\t Efficiency of triple events: ", round(efficiency_T2[-1],5))
                 
-                if mode2=="sym":
-                    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
-                    efficiency_S.append(p_single)
-                    efficiency_T.append(p_single**3)
-                    efficiency_D.append(3*(p_single)**2-2*efficiency_T[-1])
-                    if Display: print("\t Summary of TDCR measurement (delayed)")
-                    if Display: print("\t\t Free parameter = ", L, "keV-1")
-                    if Display: print("\t\t Efficiency of single events = ", round(efficiency_S[-1],5))
-                    if Display: print("\t\t Efficiency of double events = ", round(efficiency_D[-1],5))
-                    if Display: print("\t\t Efficiency of triple events = ", round(efficiency_T[-1],5))
-                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
                     pB_nosingle = np.exp(-L[1]*np.sum(np.asarray(e_quenching))/3) # probability to have 0 electrons in a PMT
@@ -582,7 +697,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                     efficiency_T.append(pA_single*pB_single*pC_single)
                     efficiency_D.append(efficiency_AB[-1]+efficiency_BC[-1]+efficiency_AC[-1]-2*efficiency_T[-1])
                     efficiency_S.append(pA_single+pB_single+pC_single-efficiency_D[-1]-efficiency_T[-1])
-                    if Display: print("\t Summary of TDCR measurement (delayed)")
+                    if Display: print("\t Summary of TDCR measurement (prompt)")
                     if Display: print("\t\t Free parameter PMT A: ", L[0], "keV-1")
                     if Display: print("\t\t Free parameter PMT B: ", L[1], "keV-1")
                     if Display: print("\t\t Free parameter PMT C: ", L[2], "keV-1")
@@ -811,4 +926,21 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                 return mean_efficiency_S, 1, mean_efficiency_D, 1, mean_efficiency_T, 1
             else:
                 return mean_efficiency_S, std_efficiency_S, mean_efficiency_D, std_efficiency_D, mean_efficiency_T, std_efficiency_T
+        if mode =="dis":
+            return efficiency_S, efficiency_D, efficiency_T    
+
+# L = (1, 1, 1)
+# TD = 0.977667386529166
+# TAB = 0.992232838598821
+# TBC = 0.992343419459002
+# TAC = 0.99275350064608
+# Rad="Cd-109"
+# pmf_1="1"
+# N = 1000
+# kB =1.0e-5
+# V = 10
+# mode = "dis"
+# mode2 = "asym"
+
 
+# S,D,T = TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=False, barp=True,uncData=True)