TDCRPy 1.11.2__py3-none-any.whl → 2.15.8__py3-none-any.whl

tdcrpy/__init__.py

@@ -1,4 +1,3 @@
 from tdcrpy import TDCRPy
 from tdcrpy import TDCR_model_lib
-from tdcrpy import TDCRoptimize
 from tdcrpy.test import test_tdcrpy

tdcrpy/config.toml

@@ -31,9 +31,23 @@ diam_micelle = 2
 # acqueous fraction of the scintillator
 fAq = 0.1
 
+## OPTICAL PROPERTIES
+# Quantum efficiency
+effQuantum = 0.25, 0.25, 0.25
+# Optical MC model
+optionModel = stochastic-dependence
+# fraction of diffused scintillation photons
+diffP = 1.0
+# relative distance from vials border to PMT entrance
+PMTspace = 0.1
+
 ## PROPERTIES OF THE COUNTER
 # Coincidence resolving time (ns)
 tau = 50
+# Extended dead time (µs)
+extDT = 10
+# Measurement time (minutes)
+measTime = 20
 
 ## INTERPOLATION TO ESTIMATE THE QUENCHED ENERGY
 # depth (number of indexes on each side of the energy point) on which the spline interpolation is done.

tdcrpy/test/test_tdcrpy.py

@@ -41,13 +41,13 @@ class TestMyModule(unittest.TestCase):
         result = tdcrpy.TDCR_model_lib.stoppingpower(100)
         self.assertEqual(result, 326.78)
         
-    def test_readBetaShape(self):
-        result = np.mean(tdcrpy.TDCR_model_lib.readBetaShape("H-3","beta-","tot"))
-        self.assertEqual(result, 4.661922025723472)
+    # def test_readBetaShape(self):
+    #     result = np.mean(tdcrpy.TDCR_model_lib.readBetaShape("H-3","beta-","tot"))
+    #     self.assertEqual(result, 4.661922025723472)
     
     def test_readBetaSpectra(self):
         result = np.mean(tdcrpy.TDCR_model_lib.readBetaSpectra("H-3"))
-        self.assertEqual(result, 4.6155)
+        self.assertEqual(result, 4.651594887459807)
     
     def test_E_quench_e(self):
         result = np.mean(tdcrpy.TDCR_model_lib.E_quench_e(100*1e3,100*1e3,0.01,20000)*1e-3)

tdcrpy/test_randomGen.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Wed May 14 16:17:16 2025
+
+@author: romain.coulon
+"""
+import numpy as np
+
+# m = 0.1
+# N = 1000000
+
+# ps0 = 1-np.exp(-m)
+
+# psi=np.random.poisson(m,N)
+# ps1 = sum(psi>0)/N
+# ups1 = np.sqrt(sum(psi>0))/N
+
+# print(ps0,ps1,ups1)
+# print(ps0-ps1,ups1)
+# print(abs(ps0-ps1)<2*ups1)
+
+import importlib
+import tdcrpy
+tdcrpy.TDCR_model_lib.modifyEffQ("0.1, 0.1, 0.1")
+# tdcrpy.TDCR_model_lib.modifyOptModel("stochastic-dependence")
+tdcrpy.TDCR_model_lib.modifyOptModel("poisson")
+L = [1.0, 1.0, 1.0]
+e_q = [100]
+diffP = 1
+importlib.reload(tdcrpy.TDCR_model_lib)
+
+Q = tdcrpy.TDCR_model_lib.readEffQ0()
+Q = Q.split(",")
+Q = [float(i) for i in Q]
+QL = [float(Qi)*L[i] for i, Qi in enumerate(Q)]
+
+e_q2 = [0]; t1 = 0; evenement = 1; extDT = 50; measTime = 60000
+
+S,D,T,_,_,_,_ = tdcrpy.TDCR_model_lib.detectProbabilities(QL, e_q, e_q2, t1, evenement, extDT, measTime)
+SmcI=[];DmcI=[];TmcI=[]
+nIter=100000
+for i in range(nIter):
+    Smc,Dmc,Tmc,_,_,_,_ = tdcrpy.TDCR_model_lib.detectProbabilitiesMC(L, e_q, e_q2, t1, evenement, extDT, measTime, dispParam=True)
+    SmcI.append(Smc); DmcI.append(Dmc); TmcI.append(Tmc)
+
+print('\n')
+tdcrpy.TDCR_model_lib.readParameters(disp=True)
+
+print("\nEffQ = ", Q, "\tEffQ*L = ", QL, "\n")
+
+print("\nEFF, EFFmc, +/-")
+print("single eff = ",round(S,4),round(np.mean(SmcI),4),round(np.std(SmcI)/np.sqrt(nIter),4))
+print("double eff = ",round(D,4),round(np.mean(DmcI),4),round(np.std(DmcI)/np.sqrt(nIter),4))
+print("triple eff = ",round(T,4),round(np.mean(TmcI),4),round(np.std(TmcI)/np.sqrt(nIter),4))
+print('\nDEVIATION < 2 sigma')
+print("single eff = ",abs(round(S,4)-round(np.mean(SmcI),4))<2*round(np.std(SmcI)/np.sqrt(nIter),4))
+print("double eff = ",abs(round(D,4)-round(np.mean(DmcI),4))<2*round(np.std(DmcI)/np.sqrt(nIter),4))
+print("triple eff = ",abs(round(T,4)-round(np.mean(TmcI),4))<2*round(np.std(TmcI)/np.sqrt(nIter),4))
+print('\nPRECISION')
+print("single eff = ",round(100*np.std(SmcI)/(np.sqrt(nIter)*round(np.mean(SmcI),4)),4)," %")
+print("double eff = ",round(100*np.std(DmcI)/(np.sqrt(nIter)*round(np.mean(DmcI),4)),4)," %")
+print("triple eff = ",round(100*np.std(TmcI)/(np.sqrt(nIter)*round(np.mean(TmcI),4)),4)," %")