TDCRPy 0.0.30__tar.gz → 0.0.31__tar.gz

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

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

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

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

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

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

{TDCRPy-0.0.30 → 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.30/tdcrpy/TDCRoptimize.py

@@ -1,76 +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(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
-    ----------
-    L : TYPE
-        DESCRIPTION.
-    TD : TYPE
-        DESCRIPTION.
-    TAB : TYPE
-        DESCRIPTION.
-    TBC : TYPE
-        DESCRIPTION.
-    TAC : TYPE
-        DESCRIPTION.
-    Rad : TYPE
-        DESCRIPTION.
-    pmf_1 : TYPE
-        DESCRIPTION.
-    kB : TYPE
-        DESCRIPTION.
-    mode2 : TYPE
-        DESCRIPTION.
-    N : TYPE, optional
-        DESCRIPTION. The default is 1000.
-    RHO : TYPE, optional
-        DESCRIPTION. The default is 098.
-    nE : TYPE, optional
-        DESCRIPTION. The default is 1000.
-    L : TYPE, optional
-        DESCRIPTION. The default is 1.
-
-    Returns
-    -------
-    TYPE
-        DESCRIPTION.
-    L : TYPE
-        DESCRIPTION.
-    TYPE
-        DESCRIPTION.
-    TYPE
-        DESCRIPTION.
-    TYPE
-        DESCRIPTION.
-
-    """
-    # 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")
-    return np.mean(L), L, out[2], out[2], out[3]
-