TDCRPy 2.19.0__tar.gz → 2.19.2__tar.gz

{tdcrpy-2.19.0/TDCRPy.egg-info → tdcrpy-2.19.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TDCRPy
-Version: 2.19.0
+Version: 2.19.2
 Summary: TDCR model
 Home-page: https://pypi.org/project/TDCRPy/
 Author: RomainCoulon (Romain Coulon)
@@ -27,6 +27,7 @@ Requires-Dist: scipy
 Requires-Dist: configparser
 Requires-Dist: importlib.resources
 Requires-Dist: matplotlib
+Requires-Dist: numba
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{tdcrpy-2.19.0 → tdcrpy-2.19.2/TDCRPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TDCRPy
-Version: 2.19.0
+Version: 2.19.2
 Summary: TDCR model
 Home-page: https://pypi.org/project/TDCRPy/
 Author: RomainCoulon (Romain Coulon)
@@ -27,6 +27,7 @@ Requires-Dist: scipy
 Requires-Dist: configparser
 Requires-Dist: importlib.resources
 Requires-Dist: matplotlib
+Requires-Dist: numba
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{tdcrpy-2.19.0 → tdcrpy-2.19.2}/TDCRPy.egg-info/requires.txt

@@ -5,3 +5,4 @@ scipy
 configparser
 importlib.resources
 matplotlib
+numba

{tdcrpy-2.19.0 → tdcrpy-2.19.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = "2.19.0"
+VERSION = "2.19.2"
 
 DESCRIPTION = "TDCR model"
 
@@ -26,7 +26,7 @@ setup(
     project_urls={'Documentation': 'https://github.com/RomainCoulon/TDCRPy/',},
     # packages = find_packages(exclude=["tdcrpy.EfficiencyProfils","tdcrpy.decay","tdcrpy.Activity_TDCR"], include=["tdcrpy.TDCR_model_lib","tdcrpy.TDCRPy", "tdcrpy.test.test_tdcrpy"]),
     packages = find_packages(),
-    install_requires = ["numpy","tqdm","setuptools","scipy","configparser","importlib.resources","matplotlib"],
+    install_requires = ["numpy","tqdm","setuptools","scipy","configparser","importlib.resources","matplotlib","numba"],
     python_requires='>=3.11',
     keywords = ["Python","TDCR","Monte-Carlo","radionuclide","scintillation","counting"],
     classifiers=[

{tdcrpy-2.19.0 → tdcrpy-2.19.2}/tdcrpy/TDCRPy.py

@@ -288,6 +288,7 @@ def TDCRPy(L, Rad, pmf_1, N, kB, V, mode="eff", Display=False, barp=False, Smode
             if fullMC:
                 efficiency0_S, efficiency0_D, efficiency0_T, efficiency0_AB, efficiency0_BC, efficiency0_AC, efficiency0_D2 = tl.detectProbabilitiesMC(L, e_quenching, e_quenching2, t1, evenement, extDT, measTime)
             else:
+                print(e_quenching)
                 efficiency0_S, efficiency0_D, efficiency0_T, efficiency0_AB, efficiency0_BC, efficiency0_AC, efficiency0_D2 = tl.detectProbabilities(L, e_quenching, e_quenching2, t1, evenement, extDT, measTime)
             
             efficiency_S.append(efficiency0_S)
@@ -1287,7 +1288,7 @@ def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False, Lbounds
 # plt.show()
 
 
-# L = 1
+# L = 0.1
 # # L = (1.1, 1.05, 1.15)
 # # TD = 0.977667386529166
 # # TD = (0.9767359812638453, 0.9925429293804757, 0.991829757077315, 0.9919970813639295) # source 1
@@ -1300,7 +1301,9 @@ def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False, Lbounds
 # kB =1.4e-5
 # V = 16
 # mode = "eff"
+# tl.modifyMicCorr(True)
 
+# out = TDCRPy(L, Rad, "1", N, kB, V, "eff", barp=True)
 
 # # # out = TDCRPy(L, Rad, pmf_1, N, kB, V, Display = False, record = True, readRecHist = False)
 # # # print("result", out)

{tdcrpy-2.19.0 → tdcrpy-2.19.2}/tdcrpy/TDCR_model_lib.py

@@ -1862,7 +1862,10 @@ def pure_mc_efficient_energy_numba(E, *, r_d_nm=diam_micelle, f_w=fAq, tracer_ty
     E in keV
     """
     if E <= 0:
-        return 0.0, 0.0, np.zeros(num_samples)
+        if num_samples==1:
+            return 0.0
+        else:
+            return 0.0, 0.0, np.zeros(num_samples)
         
     if f_w > 1.0:
         f_w = f_w / 100.0
@@ -1870,9 +1873,15 @@ def pure_mc_efficient_energy_numba(E, *, r_d_nm=diam_micelle, f_w=fAq, tracer_ty
     
     if f_w == 0.0:
         arr = np.full(num_samples, E)
-        return E, 0.0, arr
+        if num_samples==1:
+            return E
+        else:
+            return E, 0.0, arr
     if f_w == 1.0:
-        return 0.0, 0.0, np.zeros(num_samples)
+        if num_samples==1:
+            return 0.0
+        else:
+            return 0.0, 0.0, np.zeros(num_samples)
         
     is_hydro = (tracer_type == "hydrophilic")
     
@@ -1888,8 +1897,8 @@ def pure_mc_efficient_energy_numba(E, *, r_d_nm=diam_micelle, f_w=fAq, tracer_ty
 
 # out0 = micelleLoss(50)*50
 # out1 = pure_mc_efficient_energy_numba(50, tracer_type = "lipophilic")
-# out = pure_mc_efficient_energy_numba(50, tracer_type = "hydrophilic")
-# print(out0, out1, out)
+# out = pure_mc_efficient_energy_numba(0, tracer_type = "hydrophilic")
+# print(out)
 
 
 #============================================================================================