TDCRPy 0.0.29__tar.gz → 0.0.31__tar.gz

{TDCRPy-0.0.29/TDCRPy.egg-info → TDCRPy-0.0.31}/PKG-INFO

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

{TDCRPy-0.0.29 → TDCRPy-0.0.31/TDCRPy.egg-info}/PKG-INFO

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

{TDCRPy-0.0.29 → TDCRPy-0.0.31}/setup.py

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

{TDCRPy-0.0.29 → TDCRPy-0.0.31}/tdcrpy/TDCR_model_lib.py

@@ -1388,7 +1388,10 @@ def energie_dep_gamma(e_inci,v,matrice10_1=Matrice10_p_1,matrice10_2=Matrice10_p
     """
     ## sort keV / entrée : keV
     if e_inci <= 200:
-        index = int(e_inci)            # index de colonne de la matrice de l'énergie incidente la plus proche
+        if e_inci < 200:
+            index = int(e_inci)-1            # index de colonne de la matrice de l'énergie incidente la plus proche 
+        elif e_inci == 200:
+            index = -1
         if v == 10: 
             matrice = matrice10_1
         elif v == 16:
@@ -1401,27 +1404,13 @@ def energie_dep_gamma(e_inci,v,matrice10_1=Matrice10_p_1,matrice10_2=Matrice10_p
             matrice = matrice10_2
         elif v == 16:
             matrice = matrice16_2
-        #taille_x = 901
         e = ed[:,1]
 
     else:
         index = (int(e_inci)-2000)//10
-        #doc = 'MCNP-MATRIX/matrice/matrice_p_2000_10000k.txt'
-        matrice = matrice3
-        #taille_x = 801
+        matrice = matrice10_3
         e = ed[:,2]
     
-    '''
-    with open(doc) as f:
-        data = f.readlines()
-    
-        matrice = np.zeros((1002,taille_x))
-
-        for i in range(1002):
-            data[i] = data[i].split()
-            for j in range(taille_x):
-                matrice[i][j] = float(data[i][j])
-    '''
     inde = sampling(matrice[1:,index])
     if inde == 1 : result = 0
         #elif e_inci<25: result = e[inde-1]*1e3*e_inci/matrice[0][index]
@@ -1434,9 +1423,9 @@ def energie_dep_gamma(e_inci,v,matrice10_1=Matrice10_p_1,matrice10_2=Matrice10_p
 
 
 if absolutePath: 
-    fe1 = 'G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/matrice_beta-_1_200k.txt' # electron-10ml-1-200keV-niveau 0
-    fe2 = 'G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/matrice_beta-_200_2000k.txt' # electron-10ml-200-2000keV-niveau 1
-    fe3 = 'G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/matrice_beta-_2000_10000k.txt' # electron-10ml-2000-10000keV-niveau 2
+    fe1 = 'G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/matrice_10ml-beta-_1_200k.txt' # electron-10ml-1-200keV-niveau 0
+    fe2 = 'G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/matrice_10ml-beta-_200_2000k.txt' # electron-10ml-200-2000keV-niveau 1
+    fe3 = 'G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/matrice_10ml-beta-_2000_10000k.txt' # electron-10ml-2000-10000keV-niveau 2
     fe = "G:\Python_modules\Jialin\Code\\MCNP-MATRIX/matrice/fichier/E_depose.txt"   # electron-10ml-énergie-niveau 'e'
 else:
     # fe1 = 'MCNP-MATRIX/matrice/fichier/matrice_beta-_1_200k.txt' # electron-10ml-1-200keV-niveau 0
@@ -1444,9 +1433,9 @@ else:
     # fe3 = 'MCNP-MATRIX/matrice/fichier/matrice_beta-_2000_10000k.txt' # electron-10ml-2000-10000keV-niveau 2
     # fe = "MCNP-MATRIX/matrice/fichier/E_depose.txt" # electron-10ml-énergie-niveau 'e'
     with importlib.resources.path('tdcrpy', 'MCNP-MATRIX') as data_path:
-        fe1 = data_path / 'matrice/fichier/matrice_beta-_1_200k.txt' # electron-10ml-1-200keV-niveau 0
-        fe2 = data_path / 'matrice/fichier/matrice_beta-_200_2000k.txt' # electron-10ml-200-2000keV-niveau 1
-        fe3 = data_path / 'matrice/fichier/matrice_beta-_2000_10000k.txt' # electron-10ml-2000-10000keV-niveau 2
+        fe1 = data_path / 'matrice/fichier/matrice_10ml-beta-_1_200k.txt' # electron-10ml-1-200keV-niveau 0
+        fe2 = data_path / 'matrice/fichier/matrice_10ml-beta-_200_2000k.txt' # electron-10ml-200-2000keV-niveau 1
+        fe3 = data_path / 'matrice/fichier/matrice_10ml-beta-_2000_10000k.txt' # electron-10ml-2000-10000keV-niveau 2
         fe = data_path / 'matrice/fichier/E_depose.txt' # electron-10ml-énergie-niveau 'e'   
 
 
@@ -1483,10 +1472,11 @@ def energie_dep_beta(e_inci,*,matrice10_1=Matrice10_e_1,matrice10_2=Matrice10_e_
     """
     ## sort keV / entrée : keV
     if e_inci <= 200:
-        index = int(e_inci)            # index de colonne de la matrice de l'énergie incidente la plus proche 
-        #doc = 'MCNP-MATRIX/matrice/matrice_p_1_200k.txt'
+        if e_inci < 200:
+            index = int(e_inci)-1            # index de colonne de la matrice de l'énergie incidente la plus proche 
+        elif e_inci == 200:
+            index = -1
         matrice = matrice10_1
-        #taille_x = 200
         e = ed[:,0]
     
     elif e_inci <= 2000:

TDCRPy-0.0.31/tdcrpy/TDCRoptimize.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Jul  5 10:04:53 2023
+
+@author: romain.coulon, jialin.hu
+"""
+
+import numpy as np
+import tdcrpy.TDCRPy as td
+import scipy.optimize as opt
+# import sys, time
+# sys.path.insert(1, 'G:\Python_modules\BIPM_RI_PyModules')
+# import TDCRcalculation as tc 
+
+def eff(TD, TAB, TBC, TAC, Rad, pmf_1, kB, mode2, N=1000, RHO=0.98, nE=1000, L=1):
+    """
+    Caclulation of the efficiency of a TDCR system based on the model TDCRPy
+
+    Parameters
+    ----------
+    TD : float
+        triple-to-double coincidence ratio. Not consider if mode2="asym". Not consider if mode2="asym".
+    TAB : float
+        triple-to-double coincidence ratio (coincidences between channel A and B). Not consider if mode2="sym".
+    TBC : float
+        triple-to-double coincidence ratio (coincidences between channel B and C). Not consider if mode2="sym".
+    TAC : float
+        triple-to-double coincidence ratio (coincidences between channel A and C). Not consider if mode2="sym".
+    Rad : string
+        List of radionuclides.
+    pmf_1 : string
+        list of probability of each radionuclide..
+    kB : float
+        Birks constant.
+    mode2 : string
+        "sym" for symetrical model, "asym" for symetrical model.
+    N : interger, optional
+        number of Monte-Carlo trials. The default is 1000.
+    RHO : float, optional
+        density of the source. The default is 0.98.
+    nE : interger, optional
+        number of bins for the quenching function. The default is 1000.
+    L : float, optional
+        free parameter(s) as initial guess. The default is 1.
+
+    Returns
+    -------
+    L0 : float
+        global free parameter.
+    L : tuple or float
+        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.
+
+    """
+    # Estimation of the free parameter that minimize the residuals
+    r=opt.minimize_scalar(td.TDCRPy, args=(TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, "res", "sym"), method='bounded', bounds=[0.5, 2])
+    L=r.x
+    print(r)
+    
+    if mode2 == "asym":
+        L=(L, L, L)           # Free paramete in keV-1
+        r=opt.minimize(td.TDCRPy, L, args=(TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, "res", "asym"), method='nelder-mead',options={'xatol': 1e-7, 'disp': True, 'maxiter':100})
+        L=r.x
+        print(r)
+        out=td.TDCRPy(L,TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, "eff", "asym")
+    else:
+        out=td.TDCRPy(L,TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, "eff", "sym")
+        
+    L0 = np.mean(L)
+    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]
+    
+    return L0, L, eff_S, u_eff_S, eff_D, u_eff_D, eff_T, u_eff_T
+    

TDCRPy-0.0.31/tdcrpy/test.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Jul 13 19:15:23 2023
+
+@author: romain.coulon
+"""
+import tdcrpy
+
+tdcrpy.TDCRPy.TDCRPy(1, 0.5, 0.5, 0.5, 0.5, "H-3", "1", 10, 0.00001, 1,10, "eff", "sym", Display=True)

TDCRPy-0.0.29/tdcrpy/TDCRoptimize.py

@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Wed Jul  5 10:04:53 2023
-
-@author: romain.coulon
-"""
-
-import numpy as np
-import tdcrpy.TDCRPy as td
-import scipy.optimize as opt
-import sys, time
-# sys.path.insert(1, 'G:\Python_modules\BIPM_RI_PyModules')
-# import TDCRcalculation as tc 
-
-
-
-def eff(TDCR_measure, TAB, TBC, TAC, Rad, kB):
-    
-    N=50000
-    L=1
-    # r=opt.minimize_scalar(td.TDCRPy, args=(TDCR_measure, TAB, TBC, TAC, Rad, "1", N, kB, 0.98, 1000, "res", "sym"), method='golden')#,options={'xatol': 1e-7, 'disp': True, 'maxiter':100})
-    # r=opt.minimize_scalar(td.TDCRPy, args=(TDCR_measure, TAB, TBC, TAC, Rad, "1", N, kB, 0.98, 1000, "res", "sym"), method='brent')
-    r=opt.minimize_scalar(td.TDCRPy, args=(TDCR_measure, TAB, TBC, TAC, Rad, "1", N, kB, 0.98, 1000, "res", "sym"), method='bounded', bounds=[0.5, 2])
-    
-    # r=opt.minimize(td.TDCRPy, L, args=(TDCR_measure, TAB, TBC, TAC, Rad, "1", N, kB, 0.98, 1000, "res", "sym"), method='nelder-mead',options={'xatol': 1e-7, 'disp': True, 'maxiter':100})
-    L=r.x
-    print(r)
-    #L=(L*0.995, L*1.021, L*0.988)           # Free paramete in keV-1
-    # L = (L, L, L)
-    # r=opt.minimize(td.TDCRPy, L, args=(TDCR_measure, TAB, TBC, TAC, Rad, "1", N, kB, 0.98, 1000, "res", "asym"), method='nelder-mead',options={'xatol': 1e-7, 'disp': True, 'maxiter':100})
-    # L=r.x
-    # print(r)
-    out=td.TDCRPy(L,TDCR_measure, TAB, TBC, TAC, Rad, "1", N, kB, 0.98, 1000, "eff", "sym")
-    return np.mean(L), L, out[2], out[2], out[3]
-    
-def TicTocGenerator():
-    """
-    Generator that returns time differences
-    """
-    ti = 0           # initial time
-    tf = time.time() # final time
-    while True:
-        ti = tf
-        tf = time.time()
-        yield tf-ti # returns the time difference
-
-TicToc = TicTocGenerator() # create an instance of the TicTocGen generator
-
-# This will be the main function through which we define both tic() and toc()
-def toc(tempBool=True):
-    """
-    Prints the time difference yielded by generator instance TicToc
-    """
-    
-    tempTimeInterval = next(TicToc)
-    if tempBool:
-        print( "Elapsed time: %f seconds.\n" %tempTimeInterval )
-
-def tic():
-    """
-    Records a time in TicToc, marks the beginning of a time interval
-    """
-    toc(False)
-
-
-"""
-TEST
-"""
-
-# Rad="Co-60"    # list of radionuclides (Na-24)
-# kB =1.0e-5       # Birks constant in cm/keV  
-# TDCR_measure = 0.977667386529166        # Measured TDCR value
-# TAB = 0.992232838598821
-# TBC = 0.992343419459002
-# TAC = 0.99275350064608
-
-
-
-# # tic()
-# # F1, FFF, eff1, eff2 = tc.I2calc(TDCR_measure, TAB, TBC, TAC, Rad, kB)
-# # toc()
-
-# # print("/nanalytical model")
-# # print("free parameter = ", F1)
-# # print("free parameters = ", FFF)
-# # print("Double count rate efficiency (sym) = ", eff1)
-# # print("Double count rate efficiency (asym) = ", eff2)
-
-
-# tic()
-# F1, FFF, eff1, eff2, u = eff(TDCR_measure, TAB, TBC, TAC, Rad, kB)
-# toc()
-
-# print("/nstochastic model")
-# print("free parameter = ", F1)
-# print("free parameters = ", FFF)
-# print("Double count rate efficiency (sym) = ", eff1)
-# print("Double count rate efficiency (asym) = ", eff2)
-# print("u(eff) = ", u)

TDCRPy-0.0.29/tdcrpy/test.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Thu Jul 13 19:15:23 2023
-
-@author: romain.coulon
-"""
-import TDCRPy
-
-TDCRPy.TDCRPy(1, 0.5, 0.5, 0.5, 0.5, "H-3", "1", 10, 0.00001, 1,10, "eff", "sym", Display=True)
-
-
-TDCRPy.TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, RHO, nE, mode, mode2)