TDCRPy 2.0.9__py3-none-any.whl → 2.2.0__py3-none-any.whl

tdcrpy/TDCRPy.py

@@ -691,7 +691,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
                         
                         if p == "electron" or ("Auger" in p): col1 = "1"
                         elif p == "gamma" or ("X" in p): col1 = "2"
-                        elif p == "beta+": col1 = "3"
+                        elif p == "positron": col1 = "3"
                         elif p == "alpha": col1 = "4"
                         else: writeOn = False
 
@@ -709,7 +709,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
                             
                             if p == "electron" or ("Auger" in p): col1 = "1"
                             elif p == "gamma" or ("X" in p): col1 = "2"
-                            elif p == "beta+": col1 = "3"
+                            elif p == "positron": col1 = "3"
                             elif p == "alpha": col1 = "4"
                             else: writeOn = False
     
@@ -825,7 +825,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
                         
                         if p == "electron" or ("Auger" in p): col1 = "1"
                         elif p == "gamma" or ("X" in p): col1 = "2"
-                        elif p == "beta+": col1 = "3"
+                        elif p == "positron": col1 = "3"
                         elif p == "alpha": col1 = "4"
                         else: writeOn = False
 
@@ -843,7 +843,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
                             
                             if p == "electron" or ("Auger" in p): col1 = "1"
                             elif p == "gamma" or ("X" in p): col1 = "2"
-                            elif p == "beta+": col1 = "3"
+                            elif p == "positron": col1 = "3"
                             elif p == "alpha": col1 = "4"
                             else: writeOn = False
     
@@ -911,7 +911,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
                         
                         if p == "electron" or ("Auger" in p): col1 = "1"
                         elif p == "gamma" or ("X" in p): col1 = "2"
-                        elif p == "beta+": col1 = "3"
+                        elif p == "positron": col1 = "3"
                         elif p == "alpha": col1 = "4"
                         else: writeOn = False
 
@@ -929,7 +929,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
                             
                             if p == "electron" or ("Auger" in p): col1 = "1"
                             elif p == "gamma" or ("X" in p): col1 = "2"
-                            elif p == "beta+": col1 = "3"
+                            elif p == "positron": col1 = "3"
                             elif p == "alpha": col1 = "4"
                             else: writeOn = False
     
@@ -1129,113 +1129,171 @@ def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False)
     return L0, L, eff_S, u_eff_S, eff_D, u_eff_D, eff_T, u_eff_T, eff_AB, u_eff_AB, eff_BC, u_eff_BC, eff_AC, u_eff_AC, eff_D2, u_eff_D2
 
 
-# def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False):
-#     """
-#     Caclulation of the efficiency of a TDCR system based on the model TDCRPy (analytical model).
-#     This function includes optimization procedures from scipy.
+def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False):
+    """
+    Caclulation of the efficiency of a TDCR system based on the model TDCRPy (analytical model).
+    This function includes optimization procedures from scipy.
 
-#     Parameters
-#     ----------
-#     TD : float or tuple
-#         measurements. If TD is float, then TD is the measured TDCR parameter. If TD is tuple, then TD must contain the global TDCR parameter followed by specific ones (T/B, T/AB, T/BC, T/AC)
-#     Rad : string
-#         List of radionuclides (eg. "H-3, Co-60").
-#     pmf_1 : string
-#         list of probability of each radionuclide (eg. "0.8, 0.2").
-#     kB : float
-#         Birks constant in cm/keV.
-#     V : float
-#         volume of the scintillator in ml.
-#     maxiter : interger, optional
-#         maximum number of iterations of the optimization procedures
-#     xatol : float
-#         convergence parameter of the Nelder Mead optimisation
-#     disp : Boolean
-#         to display detailed results of the procedure. Default is False.
+    Parameters
+    ----------
+    TD : float or tuple
+        measurements. If TD is float, then TD is the measured TDCR parameter. If TD is tuple, then TD must contain the global TDCR parameter followed by specific ones (T/D, T/AB, T/BC, T/AC)
+    Rad : string
+        List of radionuclides (eg. "H-3, Co-60").
+    pmf_1 : string
+        list of probability of each radionuclide (eg. "0.8, 0.2").
+    kB : float
+        Birks constant in cm/keV.
+    V : float
+        volume of the scintillator in ml.
+    maxiter : interger, optional
+        maximum number of iterations of the optimization procedures
+    xatol : float
+        convergence parameter of the Nelder Mead optimisation
+    disp : Boolean
+        to display detailed results of the procedure. Default is False.
 
-#     Returns
-#     -------
-#     L0 : float
-#         global free parameter.
-#     L : tuple
-#         free parameters (relevant for the asymetric model).
-#     eff_S : float
-#         counting efficiency of single events.
-#     u_eff_S : float
-#         standard uncertainty of eff_S.
-#     eff_D : float
-#         counting efficiency of double coincidences.
-#     u_eff_D : float
-#         standard uncertainty of eff_D.
-#     eff_T : float
-#         counting efficiency of triple coincidences.
-#     u_eff_T : float
-#         standard uncertainty of eff_T.
-#     eff_AB : float
-#         counting efficiency of coincidences AB.
-#     u_eff_AB : float
-#         standard uncertainty of eff_AB.
-#     eff_BC : float
-#         counting efficiency of coincidences BC.
-#     u_eff_BC : float
-#         standard uncertainty of eff_BC.
-#     eff_AC : float
-#         counting efficiency of coincidences AC.
-#     u_eff_AC : float
-#         standard uncertainty of eff_AC.    
-#     eff_D : float
-#         counting efficiency of double coincidences in C/N configuation (not relevant).
-#     u_eff_D : float
-#         standard uncertainty of eff_D in C/N configuation (not relevant).
+    Returns
+    -------
+    L0 : float
+        global free parameter.
+    L : tuple
+        free parameters (relevant for the asymetric model).
+    eff_S : float
+        counting efficiency of single events.
+    u_eff_S : float
+        standard uncertainty of eff_S.
+    eff_D : float
+        counting efficiency of double coincidences.
+    u_eff_D : float
+        standard uncertainty of eff_D.
+    eff_T : float
+        counting efficiency of triple coincidences.
+    u_eff_T : float
+        standard uncertainty of eff_T.
+    eff_AB : float
+        counting efficiency of coincidences AB.
+    u_eff_AB : float
+        standard uncertainty of eff_AB.
+    eff_BC : float
+        counting efficiency of coincidences BC.
+    u_eff_BC : float
+        standard uncertainty of eff_BC.
+    eff_AC : float
+        counting efficiency of coincidences AC.
+    u_eff_AC : float
+        standard uncertainty of eff_AC.    
+    eff_D : float
+        counting efficiency of double coincidences in C/N configuation (not relevant).
+    u_eff_D : float
+        standard uncertainty of eff_D in C/N configuation (not relevant).
 
-#     """
-#     if isinstance(TD, (tuple, list)):
-#         symm = False
-#     else:
-#         symm = True
+    """
+    if isinstance(TD, (tuple, list)):
+        symm = False
+    else:
+        symm = True
 
-#     if symm: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD, TD, TD, TD, Rad, kB, V, "res", True, 1e3), method='bounded', bounds = (0.1, 5), options={'disp': disp, 'maxiter':maxiter})
-#     else: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "res", True, 1e3), method='bounded', bounds = (0.1, 5), options={'disp': disp, 'maxiter':maxiter})
-#     L0=r.x
-#     L=(L0, L0, L0)
-#     print(f"global free parameter = {L0} keV-1")
+    if symm: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD, TD, TD, TD, Rad, kB, V, "res", 1e3), method='bounded', bounds = (0.1, 5), options={'disp': disp, 'maxiter':maxiter})
+    else: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "res", 1e3), method='bounded', bounds = (0.1, 5), options={'disp': disp, 'maxiter':maxiter})
+    L0=r.x
+    L=(L0, L0, L0)
+    print(f"global free parameter = {L0} keV-1")
     
-#     if not symm:
-#         r=opt.minimize(tl.modelAnalytical, L, args=(TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "res", True, 1e3), method='nelder-mead',options={'xatol': xatol, 'disp': disp, 'maxiter':maxiter})
-#         L=r.x
-#         print(f"free parameters = {L} keV-1")   
+    if not symm:
+        r=opt.minimize(tl.modelAnalytical, L, args=(TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "res", 1e3), method='nelder-mead',options={'xatol': xatol, 'disp': disp, 'maxiter':maxiter})
+        L=r.x
+        print(f"free parameters = {L} keV-1")   
 
-#     if symm: out=tl.modelAnalytical(L, TD, TD, TD, TD, Rad, kB, V, "eff", True, 1e3)
-#     else: out=tl.modelAnalytical(L, TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "eff", True, 1e3)
-#     eff_S = out[0]
-#     u_eff_S = out[1]
-#     eff_D = out[2]
-#     u_eff_D = out[3]
-#     eff_T = out[4]
-#     u_eff_T = out[5]
-#     eff_AB = out[6]
-#     u_eff_AB = out[7]
-#     eff_BC = out[8]
-#     u_eff_BC = out[9]
-#     eff_AC = out[10]
-#     u_eff_AC = out[11]
+    if symm: out=tl.modelAnalytical(L, TD, TD, TD, TD, Rad, kB, V, "eff", 1e3)
+    else: out=tl.modelAnalytical(L, TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "eff", 1e3)
+    eff_S = out[0]
+    eff_D = out[1]
+    eff_T = out[2]
+    # u_eff_S = out[1]
+    # eff_D = out[2]
+    # u_eff_D = out[3]
+    # eff_T = out[4]
+    # u_eff_T = out[5]
+    # eff_AB = out[6]
+    # u_eff_AB = out[7]
+    # eff_BC = out[8]
+    # u_eff_BC = out[9]
+    # eff_AC = out[10]
+    # u_eff_AC = out[11]
     
-#     return L0, L, eff_S, u_eff_S, eff_D, u_eff_D, eff_T, u_eff_T, eff_AB, u_eff_AB, eff_BC, u_eff_BC, eff_AC, u_eff_AC
+    return L0, L, eff_S, eff_D, eff_T #, u_eff_T, eff_AB, u_eff_AB, eff_BC, u_eff_BC, eff_AC, u_eff_AC, u_eff_S, u_eff_D, 
+
+
+
+# mode = "eff"                # ask for efficiency calculation
+# Rad="Na-22"                 # radionuclides
+# pmf_1="1"                   # relatives fractions of the radionulides
+# N = 1000                    # number of Monte Carlo trials
+# kB =1.0e-5                  # Birks constant in cm keV-1
+# V = 10                      # volume of scintillator in mL
+# L=np.logspace(-3,2,num=100) # free parameter in keV-1
+
+# # TDCRPy(1, Rad, pmf_1, 10, kB, V, mode, Display= True, barp=False, record=True)
+# # Record decay histories in temporary files
+# TDCRPy(L[0], Rad, pmf_1, N, kB, V, mode, barp=True, record=True)
+
+# effS, u_effS, effD, u_effD, effT, u_effT, effD2, u_effD2 = [], [],[], [],[], [], [], []
+# for l in tqdm(L, desc="free parameters ", unit=" iterations"):
+#   out = TDCRPy(l, Rad, pmf_1, N, kB, V, mode, readRecHist=True)
+#   effS.append(out[2])
+#   u_effS.append(out[3])
+#   effD.append(out[2])
+#   u_effD.append(out[3])
+#   effT.append(out[4])
+#   u_effT.append(out[5])
+#   effD2.append(out[12])
+#   u_effD2.append(out[13])
+
+# effS=np.asarray(effS)
+# effT=np.asarray(effT)
+# effD=np.asarray(effD)
+# effD2=np.asarray(effD2)
+# u_effS=np.asarray(u_effS)
+# u_effT=np.asarray(u_effT)
+# u_effD=np.asarray(u_effD)
+# u_effD2=np.asarray(u_effD2)
 
+# tdcr=effT/effD
+# u_tdcr=np.sqrt(u_effD**2*effT**2/effD**4+u_effT**2/effD**2)
 
+# import matplotlib.pyplot as plt
+# plt.figure("efficiency vs free parameter")
+# plt.clf()
+# plt.errorbar(L,effD,yerr=u_effD,fmt="-k",label="double coincidences")
+# plt.errorbar(L,effT,yerr=u_effT,fmt="-r",label="triple coincidences")
+# plt.errorbar(L,effD2,yerr=u_effD2,fmt="-g",label="double coincidences (CIEMAT/NIST)")
+# plt.xscale('log')
+# plt.xlabel(r'$L$ /keV$^{-1}$', fontsize=14)
+# plt.ylabel(r'$\epsilon$', fontsize=14)
+# plt.legend()
 
+# plt.figure("efficiency vs TDCR")
+# plt.clf()
+# plt.errorbar(tdcr,effD,xerr=u_tdcr,yerr=u_effD,fmt="-k")
+# #plt.xscale('log')
+# plt.xlabel(r'$R_T/R_D$', fontsize=14)
+# plt.ylabel(r'$\epsilon_{D}$', fontsize=14)
+# plt.show()
 
 
 # L = 1
 # # L = (1.1, 1.05, 1.15)
-# TD = 0.977667386529166
-# # TD = (0.977667386529166, 0.992232838598821, 0.992343419459002, 0.99275350064608)
-# # # TD = (0.977667386529166, 0.995232838598821, 0.990343419459002, 0.99275350064608)
-# Rad="Co-60"
+# # TD = 0.977667386529166
+# # TD = (0.9767359812638453, 0.9925429293804757, 0.991829757077315, 0.9919970813639295) # source 1
+# # TD = (0.9768862920127371, 0.9928478299182348, 0.9912531441227223, 0.9924249578285456) # source 2
+# # TD = (0.9769014488454436, 0.9918130431206161, 0.9920156754198314, 0.9927119011073454) # source 3
+# TD = (0.9764032345164899, 0.9928417189012709, 0.9911455450383777, 0.9920402844839974) # source 4
+# Rad="Tc-99"
 # pmf_1="1"
-# N = 1000
-# kB =1.0e-5
-# V = 10
+# N = 10000
+# kB =1.4e-5
+# V = 16
 # mode = "eff"
 
 
@@ -1244,6 +1302,7 @@ def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False)
 # # # out = TDCRPy(L, Rad, pmf_1, N, kB, V, Display = False, record = False, readRecHist = True)
 # # # print("result", out)
 
-# # out = eff(TD, Rad, pmf_1, kB, V, N=1000, L=1, maxiter=20, xatol=1e-7)
-# out = effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7)
-# print(out)
+# outS = eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7)
+# outA = effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7)
+# print(outS)
+# print(outA)

tdcrpy/TDCR_model_lib.py

@@ -1277,7 +1277,7 @@ def Em_e(Ei, Ed, kB, nE, Et = Einterp_e*1e3, kB_vec = kB_e):
     """    
     if Ed <= Et or Ei != Ed:
         # run the accurate quenching model
-        r = E_quench_e(Ei,Ed,kB,nE)
+        r = E_quench_e(Ei,Ed,kB,int(nE))
     else:
         # run interpolation
         r = run_interpolate(kB_vec, kB , Ei_electron, Em_electron, Ed)
@@ -2648,7 +2648,7 @@ def relaxation_atom_ph(lacune,element,v):
 
 
 
-def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,V,mode,symm,ne):
+def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,V,mode,ne):
     """
     TDCR analytical model that is used for pure beta emitting radionuclides
     
@@ -2672,8 +2672,6 @@ def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,V,mode,symm,ne):
         volume of the scintillator in ml. run only for 10 ml
     mode : string
         "res" to return the residual, "eff" to return efficiencies.
-    symm : boolean
-        "True" for symetrical model, "False" for symetrical model.
     nE : integer
          Number of bins for the quenching function.
     
@@ -2699,7 +2697,7 @@ def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,V,mode,symm,ne):
         em[i] = Em_e(ei*1e3,ei*1e3,kB*1e3,ne)*1e-3
         
         
-    if symm:
+    if type(L)==float or isinstance(L, np.float64):
         eff_S = sum(p*(1-np.exp(-L*em/3)))
         eff_T = sum(p*(1-np.exp(-L*em/3))**3)
         eff_D = sum(p*(3*(1-np.exp(-L*em/3))**2-2*(1-np.exp(-L*em/3))**3))

{TDCRPy-2.0.9.dist-info → tdcrpy-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: TDCRPy
-Version: 2.0.9
+Version: 2.2.0
 Summary: TDCR model
 Home-page: https://pypi.org/project/TDCRPy/
 Author: RomainCoulon (Romain Coulon)
@@ -27,6 +27,18 @@ Requires-Dist: scipy
 Requires-Dist: configparser
 Requires-Dist: importlib.resources
 Requires-Dist: matplotlib
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # 1. About TDCRPy
 

{TDCRPy-2.0.9.dist-info → tdcrpy-2.2.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=WRH8ASoJSEXAl3Vw0t01DZelIJ4Kguu97nEriHuLq-g,64862
+tdcrpy/TDCRPy.py,sha256=W_bP1lC0s1zgIEqio9CjynO8yKKiVVYXA-VvPZbdHJw,66998
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=3XsTOUqO8tE0NMOSrBOV2H449jvbbjXfH5jrHcaSqdM,126576
+tdcrpy/TDCR_model_lib.py,sha256=o7pMbr8IsnfzC4RIDRaZjQ_CY65HmcVSBEgPHLxNWRI,126529
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=9Djir8dPNchcJVQvhl-oRHEOsoDkiZlkOhWT-eHR7wQ,95
 tdcrpy/config.toml,sha256=d_olKEgxfobBHkZ2wEj9EgKE7I8Wbpim9ZAsi5ImFxk,1470
@@ -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.0.9.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-2.0.9.dist-info/METADATA,sha256=0xVdi8fVqWioXTFpTKmsc8SLQ7d45sZtXCoOpqXBaKc,45040
-TDCRPy-2.0.9.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-TDCRPy-2.0.9.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-2.0.9.dist-info/RECORD,,
+tdcrpy-2.2.0.dist-info/licenses/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+tdcrpy-2.2.0.dist-info/METADATA,sha256=8LauuFHTb8gVFJn1Knb38BX_wptMRdl6slBbJKPDN_I,45298
+tdcrpy-2.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+tdcrpy-2.2.0.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+tdcrpy-2.2.0.dist-info/RECORD,,

{TDCRPy-2.0.9.dist-info → tdcrpy-2.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any