TDCRPy 1.8.14__py3-none-any.whl → 1.8.16__py3-none-any.whl

{TDCRPy-1.8.14.dist-info → TDCRPy-1.8.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 1.8.14
+Version: 1.8.16
 Summary: TDCR model
 Home-page: https://pypi.org/project/TDCRPy/
 Author: RomainCoulon (Romain Coulon)
@@ -30,7 +30,7 @@ Requires-Dist: matplotlib
 
 # TDCRPy
 
-`TDCRPy` is a Python code to calculate detection efficiency of a liquide scintillation counter using 3-photomultiplier tubes.
+`TDCRPy` is a Python code to calculate detection efficiency of a liquid scintillation counter using 3-photomultiplier tubes.
 The calculation is based on the photo-physical model called of the Triple-to-Double-Coincidence-Ratio method (TDCR) and a Monte-Carlo sampling allowing to adress complexe decay schemes and radionuclide mixtures.
 
 The code is developped and maintained by the BIPM (MIT license).
@@ -88,111 +88,6 @@ At first, the TDCRPy module must be imported.
 ```python
 import tdcrpy
 ```
-
-### TDCRoptimize.eff()
-
-In practice, `TDCRoptimize.eff()` is the fonction used to estimate the counting efficiency of a TDCR system. It approximates the free parameter(s) `L` in order to minimize the residual estimated by `TDCRPy()` for a given set of measurement data. In `mode2 = "sym"`, the *golden section search technique* is applied with a maximum number of iterations of 20. In `mode2 = "asym"`, the *Nelder-Mead technique* is applied with a maximum number of iterations of 20.
-
-`TDCRoptimize.eff()` is parametrised by the following parameters:
-*  `TD` (type `float`) is the quotient of the triple coincidence count rate divided by the logic sum of the double coincidence count rate.
-*  `TAB` (type `float`) is the quotient of the triple coincidence count rate divided by the double coincidence count rate between the channel A and B.
-*  `TBC` (type `float`) is the quotient of the triple coincidence count rate divided by the double coincidence count rate between the channel B and C.
-*  `TAC` (type `float`) is the quotient of the triple coincidence count rate divided by the double coincidence count rate between the channel A and C.
-*  `rad` (type `string`) is the list of radionuclides contained in the solution, e.g. `"H-3"`, `"H-3, Co-60"`.
-*  `pmf_1` (type `string`) is the probability of each radionuclide contained in `rad`. If `rad = "H-3, Co-60"` and `pmf_1="0.8, 0.2"`, the solution contains 80 % of tritium and 20 % of cobalt 60.
-*  `kB` (type `float`) is the Birks constant caracterizing the scintillator. It is espressed in cm/keV.
-*  `V` (type `float`) is the volume in ml of the scintillator.
-*  `mode2` sets whether the TDCR system has to be considered symetrical `mode2="sym"` or not symetrical `mode2="asym"`.
-*  `N` (type `integer`) is the number of Monte-Carlo trials corresponding each, to a simulated nuclear decay in the scintillator. Monte-Carlo calculation is not used in the case of pure beta emitting radionuclides where the analytical model is implemented. It is an optional parameter set by default at `N = 10000`.
-*  `L` (type `float`) initial guess of the free parameter(s) in keV^-1^. It represents the number of photoelectrons produced by the PMTs per unit of ionisation energy released in the scintillator during a decay and in the abscence of scintillation quenching. It is set by default at `L = 1`.
-
-`TDCRoptimize.eff()` returns:
-*  the global free parameter *L*,
-*  the free parameters related to each channel (*L<sub>A</sub>*, *L<sub>B</sub>*, *L<sub>C</sub>*),
-*  the estimation of the counting efficiency of single events *S*,
-*  the standard uncertainty of the estimation of *S*,
-*  the estimation of the counting efficiency of double coincidences *D*,
-*  the standard uncertainty of the estimation of *D*,
-*  the estimation of the counting efficiency of triple coincidences *T*,
-*  the standard uncertainty of the estimation of *T*.
-
-Example with `mode2 = "sym"`: 
-
-```python
-import tdcrpy
-
-TD = 0.977667386529166
-TAB = 0.992232838598821
-TBC = 0.992343419459002
-TAC = 0.99275350064608
-Rad="Co-60"
-pmf_1="1"
-N = 250
-kB =1.0e-5
-V = 10
-mode2 = "sym"
-
-result = tdcrpy.TDCRoptimize.eff(TD, TAB, TBC, TAC, Rad, pmf_1, kB, V, mode2, N=N)
-
-print("Global free parameter = \t", round(result[0],4), " keV-1")
-print("Free parameter (PMT A) = \t", round(result[1][0],4) , " keV-1")
-print("Free parameter (PMT B) = \t", round(result[1][1],4) , " keV-1")
-print("Free parameter (PMT C) = \t", round(result[1][2],4) , " keV-1")
-print("efficiency S = \t", round(result[2],4), "+/-", round(result[3],4))
-print("efficiency D = \t", round(result[4],4), "+/-", round(result[5],4))
-print("efficiency T = \t", round(result[6],4), "+/-", round(result[7],4))
-```
-
-```Console
-Global free parameter = 	 1.3061  keV-1
-Free parameter (PMT A) = 	 1.3061  keV-1
-Free parameter (PMT B) = 	 1.3061  keV-1
-Free parameter (PMT C) = 	 1.3061  keV-1
-efficiency S = 	 0.979 +/- 0.0067
-efficiency D = 	 0.9833 +/- 0.0064
-efficiency T = 	 0.963 +/- 0.0096
-```
-
-Example with `mode2 = "asym"`: 
-
-```python
-import tdcrpy
-
-TD = 0.977667386529166
-TAB = 0.992232838598821
-TBC = 0.992343419459002
-TAC = 0.99275350064608
-Rad="Co-60"
-pmf_1="1"
-N = 250
-kB =1.0e-5
-V = 10
-mode2 = "asym"
-
-result = tdcrpy.TDCRoptimize.eff(TD, TAB, TBC, TAC, Rad, pmf_1, kB, V, mode2, N=N)
-
-print("Global free parameter = \t", round(result[0],4), " keV-1")
-print("Free parameter (PMT A) = \t", round(result[1][0],4) , " keV-1")
-print("Free parameter (PMT B) = \t", round(result[1][1],4) , " keV-1")
-print("Free parameter (PMT C) = \t", round(result[1][2],4) , " keV-1")
-print("efficiency S = \t", round(result[2],4), "+/-", round(result[3],4))
-print("efficiency D = \t", round(result[4],4), "+/-", round(result[5],4))
-print("efficiency T = \t", round(result[6],4), "+/-", round(result[7],4))
-```
-
-```Console
-Global free parameter = 	 1.3061  keV-1
-Free parameter (PMT A) = 	 1.3061  keV-1
-Free parameter (PMT B) = 	 1.3061  keV-1
-Free parameter (PMT C) = 	 1.3061  keV-1
-efficiency S = 	 0.979 +/- 0.0067
-efficiency D = 	 0.9833 +/- 0.0064
-efficiency T = 	 0.963 +/- 0.0096
-```
-
-
-
-
 ### TDCRPy()
 
 The main function of the TDCRPy module is `TDCRPy()` in which the Monte-Carlo Triple-to-Double Coincidence Ratio model is implemented. The computation is made for a given solution containing a radionuclide (or a mixture of radionuclides) `rad`, a given volume of scintillator `V` and a given Birks constant `kB`.
@@ -334,4 +229,105 @@ An advanced setting can be configured in the `config.toml` file for functions `T
 and `nE_alpha = 1000`. These values ensure an error on quenched energy estimation from numerical approximation below 10^-3^.
 * By default the calculation is set for Ultima-Gold cocktail mixed with a small amount of aqueous solution. You can adapt for a specific scintillator by changing the `density` (default `density=0.96`), the mean charge number `Z` (default `Z=5.2`) and the mean mass number `A` (default `A=11.04`) of the scintillator.
 * To optimize the speed of the Monte-Carlo calculation, a spline interpolation on precalculated quenched energy is applied. The parameter `depthSpline` (default `depthSpline = 5`) sets the number of bins on each side of the energy point on which the interpolation is applied. The parameter `Einterp` (default `Einterp = 1`) set the energy (in keV) above which the interpolation is applied.
+
+### TDCRoptimize.eff()
+
+An optimization procedure `TDCRoptimize.eff()` is proposed to estimate the counting efficiency of a TDCR system. It approximates the free parameter(s) `L` in order to minimize the residual estimated by `TDCRPy()` for a given set of measurement data. In `mode2 = "sym"`, the *golden section search technique* is applied with a maximum number of iterations of 20. In `mode2 = "asym"`, the *Nelder-Mead technique* is applied with a maximum number of iterations of 20.
+
+`TDCRoptimize.eff()` is parametrised by the following parameters:
+*  `TD` (type `float`) is the quotient of the triple coincidence count rate divided by the logic sum of the double coincidence count rate.
+*  `TAB` (type `float`) is the quotient of the triple coincidence count rate divided by the double coincidence count rate between the channel A and B.
+*  `TBC` (type `float`) is the quotient of the triple coincidence count rate divided by the double coincidence count rate between the channel B and C.
+*  `TAC` (type `float`) is the quotient of the triple coincidence count rate divided by the double coincidence count rate between the channel A and C.
+*  `rad` (type `string`) is the list of radionuclides contained in the solution, e.g. `"H-3"`, `"H-3, Co-60"`.
+*  `pmf_1` (type `string`) is the probability of each radionuclide contained in `rad`. If `rad = "H-3, Co-60"` and `pmf_1="0.8, 0.2"`, the solution contains 80 % of tritium and 20 % of cobalt 60.
+*  `kB` (type `float`) is the Birks constant caracterizing the scintillator. It is espressed in cm/keV.
+*  `V` (type `float`) is the volume in ml of the scintillator.
+*  `mode2` sets whether the TDCR system has to be considered symetrical `mode2="sym"` or not symetrical `mode2="asym"`.
+*  `N` (type `integer`) is the number of Monte-Carlo trials corresponding each, to a simulated nuclear decay in the scintillator. Monte-Carlo calculation is not used in the case of pure beta emitting radionuclides where the analytical model is implemented. It is an optional parameter set by default at `N = 10000`.
+*  `L` (type `float`) initial guess of the free parameter(s) in keV^-1^. It represents the number of photoelectrons produced by the PMTs per unit of ionisation energy released in the scintillator during a decay and in the abscence of scintillation quenching. It is set by default at `L = 1`.
+
+`TDCRoptimize.eff()` returns:
+*  the global free parameter *L*,
+*  the free parameters related to each channel (*L<sub>A</sub>*, *L<sub>B</sub>*, *L<sub>C</sub>*),
+*  the estimation of the counting efficiency of single events *S*,
+*  the standard uncertainty of the estimation of *S*,
+*  the estimation of the counting efficiency of double coincidences *D*,
+*  the standard uncertainty of the estimation of *D*,
+*  the estimation of the counting efficiency of triple coincidences *T*,
+*  the standard uncertainty of the estimation of *T*.
+
+Example with `mode2 = "sym"`: 
+
+```python
+import tdcrpy
+
+TD = 0.977667386529166
+TAB = 0.992232838598821
+TBC = 0.992343419459002
+TAC = 0.99275350064608
+Rad="Co-60"
+pmf_1="1"
+N = 250
+kB =1.0e-5
+V = 10
+mode2 = "sym"
+
+result = tdcrpy.TDCRoptimize.eff(TD, TAB, TBC, TAC, Rad, pmf_1, kB, V, mode2, N=N)
+
+print("Global free parameter = \t", round(result[0],4), " keV-1")
+print("Free parameter (PMT A) = \t", round(result[1][0],4) , " keV-1")
+print("Free parameter (PMT B) = \t", round(result[1][1],4) , " keV-1")
+print("Free parameter (PMT C) = \t", round(result[1][2],4) , " keV-1")
+print("efficiency S = \t", round(result[2],4), "+/-", round(result[3],4))
+print("efficiency D = \t", round(result[4],4), "+/-", round(result[5],4))
+print("efficiency T = \t", round(result[6],4), "+/-", round(result[7],4))
+```
+
+```Console
+Global free parameter = 	 1.3061  keV-1
+Free parameter (PMT A) = 	 1.3061  keV-1
+Free parameter (PMT B) = 	 1.3061  keV-1
+Free parameter (PMT C) = 	 1.3061  keV-1
+efficiency S = 	 0.979 +/- 0.0067
+efficiency D = 	 0.9833 +/- 0.0064
+efficiency T = 	 0.963 +/- 0.0096
+```
+
+Example with `mode2 = "asym"`: 
+
+```python
+import tdcrpy
+
+TD = 0.977667386529166
+TAB = 0.992232838598821
+TBC = 0.992343419459002
+TAC = 0.99275350064608
+Rad="Co-60"
+pmf_1="1"
+N = 250
+kB =1.0e-5
+V = 10
+mode2 = "asym"
+
+result = tdcrpy.TDCRoptimize.eff(TD, TAB, TBC, TAC, Rad, pmf_1, kB, V, mode2, N=N)
+
+print("Global free parameter = \t", round(result[0],4), " keV-1")
+print("Free parameter (PMT A) = \t", round(result[1][0],4) , " keV-1")
+print("Free parameter (PMT B) = \t", round(result[1][1],4) , " keV-1")
+print("Free parameter (PMT C) = \t", round(result[1][2],4) , " keV-1")
+print("efficiency S = \t", round(result[2],4), "+/-", round(result[3],4))
+print("efficiency D = \t", round(result[4],4), "+/-", round(result[5],4))
+print("efficiency T = \t", round(result[6],4), "+/-", round(result[7],4))
+```
+
+```Console
+Global free parameter = 	 1.3061  keV-1
+Free parameter (PMT A) = 	 1.3061  keV-1
+Free parameter (PMT B) = 	 1.3061  keV-1
+Free parameter (PMT C) = 	 1.3061  keV-1
+efficiency S = 	 0.979 +/- 0.0067
+efficiency D = 	 0.9833 +/- 0.0064
+efficiency T = 	 0.963 +/- 0.0096
+```
        

{TDCRPy-1.8.14.dist-info → TDCRPy-1.8.16.dist-info}/RECORD

@@ -1,9 +1,9 @@
-tdcrpy/TDCRPy.py,sha256=XJHHuGwsp_yn422nupus6luRAp4a58vZPT9PO8ilOVE,53211
+tdcrpy/TDCRPy.py,sha256=Bum4D8UYnWrr2Fa--2RdvvpTaeqIZ4KGc2o230hyt8A,53469
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=PE4365_HRBc5lB_4n0W2-UQ32LF9juA0Z_mI4M2cxtI,96132
+tdcrpy/TDCR_model_lib.py,sha256=k1SYxO5qZyL-IOn-EX465zXa8H4DY8eNZHqVqlkoI8k,98155
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
-tdcrpy/config.toml,sha256=xPejXoPI4m4FgG8hIYLEyMA-y8MBCF3PaWtv55TqHeQ,1646
+tdcrpy/config.toml,sha256=Qm7_Mo3nBKUfNLqhUMP4zA-pjNksy9DzRb7LVR135oY,1876
 tdcrpy/test2.py,sha256=poLLXJyIaCeqh1VSkwgbi-udvY7lQjxz_YStKjJXGhU,501
 tdcrpy/EfficiencyCurves/Ag-108/EffD_Ag-108_[1]_1e-05.txt,sha256=OUoMuqPTw3fXLu5qaHUFN2iW0dPJ9cRyh99a6mUcEus,43
 tdcrpy/EfficiencyCurves/Ag-108/EffS_Ag-108_[1]_1e-05.txt,sha256=hojCq_MFAw8ONjoDmQfeE9gCXISwhScgAk-N0Pjbg00,45
@@ -1041,6 +1041,8 @@ tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-beta-_200_2000k.txt,sha256=mqo4-
 tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_1_200k.txt,sha256=kxDaTMq-3H_telytHRV-bJXynqSyW9SmUMRVDW6y3yY,4213603
 tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_2000_10000k.txt,sha256=oKl_dTNoQCPAliK1erzvtO1PHBCRItAZvY0wkBa_qN4,16872466
 tdcrpy/MCNP-MATRIX/matrice/fichier/matrice_16ml-photon_200_2000k.txt,sha256=B1f_TWs6wzreI4mbYYJDOkm2aDik49w4yQ96tR7Awe0,18978766
+tdcrpy/Micelle/2nmfaq01.csv,sha256=nLnOq8HyJGJSHeJ91-ZLRUZPgmaogiHcQk1SicHYaqE,1340
+tdcrpy/Micelle/faq01.csv,sha256=qltui-MvcFMlgH3czHx-EknHNE2LdCvN5S3SN-OAdmw,4065
 tdcrpy/Quenching/QuenchEnergyAlpha_0.015.txt,sha256=kaSid3pQuBSwIeJ7CTmx6NsFgr2_A6u5GOgMqJiVvQA,195818
 tdcrpy/Quenching/QuenchEnergyAlpha_1.1e-05.txt,sha256=lozxOyzSB4FAukpuTQUGbtQHqiWldqMXXMgstEC76sc,182522
 tdcrpy/Quenching/QuenchEnergyAlpha_1.2e-05.txt,sha256=pjH7BVj9ohsPjL6hD6nJvL76nIL6HhkcVsmRYskI7dU,182825
@@ -1078,8 +1080,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=3b9PeT2ROGGEFM_G4EVlDQMdP4B3ONp4a0kh1bKyVkI,4003
-TDCRPy-1.8.14.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.8.14.dist-info/METADATA,sha256=tsr1_9F0SFVSoetVUUZtOPfQGkxQ0UU1LAaFqidjI20,15601
-TDCRPy-1.8.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-TDCRPy-1.8.14.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.8.14.dist-info/RECORD,,
+TDCRPy-1.8.16.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.8.16.dist-info/METADATA,sha256=gsWRh4ib9yuqUMqvBvaOOnraTBbMRJ6mQcOoqZgiI9g,15600
+TDCRPy-1.8.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+TDCRPy-1.8.16.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.8.16.dist-info/RECORD,,

{TDCRPy-1.8.14.dist-info → TDCRPy-1.8.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tdcrpy/Micelle/2nmfaq01.csv

@@ -0,0 +1,150 @@
+10;0.9
+20;0.84
+30;0.84
+40;0.84
+50;0.84
+60;0.85
+70;0.85
+80;0.86
+90;0.86
+100;0.87
+110;0.87
+120;0.87
+130;0.87
+140;0.87
+150;0.88
+160;0.88
+170;0.88
+180;0.88
+190;0.88
+200;0.89
+210;0.89
+220;0.89
+230;0.89
+240;0.89
+250;0.89
+260;0.89
+270;0.89
+280;0.89
+290;0.89
+300;0.89
+310;0.89
+320;0.89
+330;0.89
+340;0.89
+350;0.89
+360;0.89
+370;0.89
+380;0.89
+390;0.89
+400;0.89
+410;0.89
+420;0.89
+430;0.89
+440;0.89
+450;0.89
+460;0.89
+470;0.89
+480;0.89
+490;0.89
+500;0.89
+510;0.89
+520;0.89
+530;0.89
+540;0.89
+550;0.89
+560;0.89
+570;0.89
+580;0.89
+590;0.89
+600;0.89
+610;0.89
+620;0.89
+630;0.89
+640;0.89
+650;0.89
+660;0.89
+670;0.89
+680;0.89
+690;0.89
+700;0.89
+710;0.89
+720;0.89
+730;0.89
+740;0.89
+750;0.89
+760;0.89
+770;0.89
+780;0.89
+790;0.89
+800;0.89
+810;0.89
+820;0.89
+830;0.89
+840;0.89
+850;0.89
+860;0.89
+870;0.89
+880;0.89
+890;0.89
+900;0.89
+910;0.89
+920;0.89
+930;0.89
+940;0.89
+950;0.89
+960;0.89
+970;0.89
+980;0.89
+990;0.89
+1000;0.9
+1010;0.9
+1020;0.9
+1030;0.9
+1040;0.9
+1050;0.9
+1060;0.9
+1070;0.9
+1080;0.9
+1090;0.9
+1100;0.9
+1110;0.9
+1120;0.9
+1130;0.9
+1140;0.9
+1150;0.9
+1160;0.9
+1170;0.9
+1180;0.9
+1190;0.9
+1200;0.9
+1210;0.9
+1220;0.9
+1230;0.9
+1240;0.9
+1250;0.9
+1260;0.9
+1270;0.9
+1280;0.9
+1290;0.9
+1300;0.9
+1310;0.9
+1320;0.9
+1330;0.9
+1340;0.9
+1350;0.9
+1360;0.9
+1370;0.9
+1380;0.9
+1390;0.9
+1400;0.9
+1410;0.9
+1420;0.9
+1430;0.9
+1440;0.9
+1450;0.9
+1460;0.9
+1470;0.9
+1480;0.9
+1490;0.9
+1500;0.9

tdcrpy/Micelle/faq01.csv

@@ -0,0 +1,151 @@
+0;0.9;0.9;0.9;0.9;0.9
+10;0.9;0.9;0.9;0.9;0.9
+20;0.88;0.84;0.75;0.66;0.58
+30;0.88;0.84;0.76;0.67;0.6
+40;0.88;0.84;0.76;0.67;0.6
+50;0.88;0.84;0.76;0.67;0.6
+60;0.88;0.85;0.76;0.67;0.6
+70;0.88;0.85;0.77;0.69;0.61
+80;0.88;0.86;0.78;0.7;0.62
+90;0.88;0.86;0.79;0.71;0.63
+100;0.88;0.87;0.8;0.72;0.64
+110;0.89;0.87;0.8;0.73;0.65
+120;0.89;0.87;0.81;0.74;0.67
+130;0.89;0.87;0.82;0.75;0.68
+140;0.89;0.87;0.82;0.76;0.69
+150;0.89;0.88;0.83;0.77;0.71
+160;0.89;0.88;0.83;0.78;0.72
+170;0.89;0.88;0.84;0.79;0.74
+180;0.89;0.88;0.84;0.81;0.76
+190;0.89;0.88;0.85;0.82;0.78
+200;0.9;0.89;0.86;0.83;0.8
+210;0.9;0.89;0.86;0.84;0.8
+220;0.9;0.89;0.86;0.84;0.81
+230;0.9;0.89;0.86;0.85;0.82
+240;0.9;0.89;0.86;0.85;0.82
+250;0.9;0.89;0.86;0.86;0.83
+260;0.9;0.89;0.86;0.86;0.83
+270;0.9;0.89;0.86;0.86;0.84
+280;0.9;0.89;0.86;0.87;0.85
+290;0.9;0.89;0.86;0.87;0.85
+300;0.9;0.89;0.87;0.87;0.86
+310;0.9;0.89;0.87;0.87;0.86
+320;0.9;0.89;0.87;0.87;0.86
+330;0.9;0.89;0.87;0.87;0.86
+340;0.9;0.89;0.87;0.87;0.86
+350;0.9;0.89;0.87;0.87;0.86
+360;0.9;0.89;0.87;0.87;0.86
+370;0.9;0.89;0.87;0.87;0.86
+380;0.9;0.89;0.87;0.87;0.86
+390;0.9;0.89;0.87;0.87;0.86
+400;0.9;0.89;0.88;0.87;0.86
+410;0.9;0.89;0.88;0.87;0.86
+420;0.9;0.89;0.88;0.87;0.86
+430;0.9;0.89;0.88;0.87;0.86
+440;0.9;0.89;0.88;0.87;0.86
+450;0.9;0.89;0.88;0.87;0.86
+460;0.9;0.89;0.88;0.87;0.86
+470;0.9;0.89;0.88;0.87;0.86
+480;0.9;0.89;0.88;0.87;0.87
+490;0.9;0.89;0.88;0.87;0.87
+500;0.9;0.89;0.89;0.87;0.87
+510;0.9;0.89;0.89;0.88;0.87
+520;0.9;0.89;0.89;0.88;0.87
+530;0.9;0.89;0.89;0.88;0.87
+540;0.9;0.89;0.89;0.88;0.87
+550;0.9;0.89;0.89;0.88;0.87
+560;0.9;0.89;0.89;0.88;0.87
+570;0.9;0.89;0.89;0.88;0.87
+580;0.9;0.89;0.89;0.88;0.87
+590;0.9;0.89;0.89;0.88;0.87
+600;0.9;0.89;0.89;0.88;0.87
+610;0.9;0.89;0.89;0.88;0.87
+620;0.9;0.89;0.89;0.88;0.87
+630;0.9;0.89;0.89;0.88;0.87
+640;0.9;0.89;0.89;0.88;0.87
+650;0.9;0.89;0.89;0.88;0.87
+660;0.9;0.89;0.89;0.88;0.87
+670;0.9;0.89;0.89;0.88;0.87
+680;0.9;0.89;0.89;0.89;0.87
+690;0.9;0.89;0.89;0.89;0.87
+700;0.9;0.89;0.89;0.89;0.87
+710;0.9;0.89;0.89;0.89;0.87
+720;0.9;0.89;0.89;0.89;0.87
+730;0.9;0.89;0.89;0.89;0.87
+740;0.9;0.89;0.89;0.89;0.87
+750;0.9;0.89;0.89;0.89;0.87
+760;0.9;0.89;0.89;0.89;0.88
+770;0.9;0.89;0.89;0.89;0.88
+780;0.9;0.89;0.89;0.89;0.88
+790;0.9;0.89;0.89;0.89;0.88
+800;0.9;0.89;0.89;0.89;0.88
+810;0.9;0.89;0.89;0.89;0.88
+820;0.9;0.89;0.89;0.89;0.88
+830;0.9;0.89;0.89;0.89;0.88
+840;0.9;0.89;0.89;0.89;0.88
+850;0.9;0.89;0.89;0.89;0.88
+860;0.9;0.89;0.89;0.89;0.88
+870;0.9;0.89;0.89;0.89;0.88
+880;0.9;0.89;0.89;0.89;0.88
+890;0.9;0.89;0.89;0.89;0.88
+900;0.9;0.89;0.89;0.89;0.88
+910;0.9;0.89;0.89;0.89;0.88
+920;0.9;0.89;0.89;0.89;0.88
+930;0.9;0.89;0.89;0.89;0.89
+940;0.9;0.89;0.89;0.89;0.89
+950;0.9;0.89;0.89;0.89;0.89
+960;0.9;0.89;0.89;0.89;0.89
+970;0.9;0.89;0.89;0.89;0.89
+980;0.9;0.89;0.89;0.89;0.89
+990;0.9;0.89;0.89;0.89;0.89
+1000;0.9;0.9;0.9;0.9;0.9
+1010;0.9;0.9;0.9;0.9;0.9
+1020;0.9;0.9;0.9;0.9;0.9
+1030;0.9;0.9;0.9;0.9;0.9
+1040;0.9;0.9;0.9;0.9;0.9
+1050;0.9;0.9;0.9;0.9;0.9
+1060;0.9;0.9;0.9;0.9;0.9
+1070;0.9;0.9;0.9;0.9;0.9
+1080;0.9;0.9;0.9;0.9;0.9
+1090;0.9;0.9;0.9;0.9;0.9
+1100;0.9;0.9;0.9;0.9;0.9
+1110;0.9;0.9;0.9;0.9;0.9
+1120;0.9;0.9;0.9;0.9;0.9
+1130;0.9;0.9;0.9;0.9;0.9
+1140;0.9;0.9;0.9;0.9;0.9
+1150;0.9;0.9;0.9;0.9;0.9
+1160;0.9;0.9;0.9;0.9;0.9
+1170;0.9;0.9;0.9;0.9;0.9
+1180;0.9;0.9;0.9;0.9;0.9
+1190;0.9;0.9;0.9;0.9;0.9
+1200;0.9;0.9;0.9;0.9;0.9
+1210;0.9;0.9;0.9;0.9;0.9
+1220;0.9;0.9;0.9;0.9;0.9
+1230;0.9;0.9;0.9;0.9;0.9
+1240;0.9;0.9;0.9;0.9;0.9
+1250;0.9;0.9;0.9;0.9;0.9
+1260;0.9;0.9;0.9;0.9;0.9
+1270;0.9;0.9;0.9;0.9;0.9
+1280;0.9;0.9;0.9;0.9;0.9
+1290;0.9;0.9;0.9;0.9;0.9
+1300;0.9;0.9;0.9;0.9;0.9
+1310;0.9;0.9;0.9;0.9;0.9
+1320;0.9;0.9;0.9;0.9;0.9
+1330;0.9;0.9;0.9;0.9;0.9
+1340;0.9;0.9;0.9;0.9;0.9
+1350;0.9;0.9;0.9;0.9;0.9
+1360;0.9;0.9;0.9;0.9;0.9
+1370;0.9;0.9;0.9;0.9;0.9
+1380;0.9;0.9;0.9;0.9;0.9
+1390;0.9;0.9;0.9;0.9;0.9
+1400;0.9;0.9;0.9;0.9;0.9
+1410;0.9;0.9;0.9;0.9;0.9
+1420;0.9;0.9;0.9;0.9;0.9
+1430;0.9;0.9;0.9;0.9;0.9
+1440;0.9;0.9;0.9;0.9;0.9
+1450;0.9;0.9;0.9;0.9;0.9
+1460;0.9;0.9;0.9;0.9;0.9
+1470;0.9;0.9;0.9;0.9;0.9
+1480;0.9;0.9;0.9;0.9;0.9
+1490;0.9;0.9;0.9;0.9;0.9
+1500;0.9;0.9;0.9;0.9;0.9

tdcrpy/TDCRPy.py

@@ -167,6 +167,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
     config.read(file_conf)
     tau=config["Inputs"].getfloat("tau")
     Y=config["Inputs"].getboolean("Y")
+    micCorr=config["Inputs"].getboolean("micCorr")
     radListPureBeta=config["Inputs"].get("radListPureBeta")
     radListPureBeta=radListPureBeta.replace(" ","")
     radListPureBeta=radListPureBeta.split(',')
@@ -659,6 +660,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                     e_quenching.append(energy_vec[i])
                 elif p == "electron" or p == "positron":
                     energy_vec[i] = tl.Em_e(energy_vec_initial[i]*1e3,energy_vec[i]*1e3,kB*1e3,nE_electron)*1e-3
+                    if micCorr: energy_vec[i] = energy_vec[i]*tl.micelleLoss(energy_vec_initial[i])
                     e_quenching.append(energy_vec[i])
                 else:
                     e_quenching.append(0)
@@ -677,6 +679,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
                         e_quenching2.append(energy_vec2[i])
                     elif p == "electron" or p == "positron":
                         energy_vec2[i] = tl.Em_e(energy_vec_initial2[i]*1e3,energy_vec2[i]*1e3,kB*1e3,nE_electron)*1e-3
+                        if micCorr: energy_vec2[i] = energy_vec2[i]*tl.micelleLoss(energy_vec_initial2[i])
                         e_quenching2.append(energy_vec2[i])
                     else:
                         e_quenching2.append(0) 

tdcrpy/TDCR_model_lib.py

@@ -40,6 +40,8 @@ A = config["Inputs"].getfloat("A")
 depthSpline = config["Inputs"].getint("depthSpline")
 Einterp_a = config["Inputs"].getfloat("Einterp_a")
 Einterp_e = config["Inputs"].getfloat("Einterp_e")
+diam_micelle = config["Inputs"].getfloat("diam_micelle")
+fAq = config["Inputs"].getfloat("fAq")
 
 # import PenNuc data
 with importlib.resources.as_file(files('tdcrpy').joinpath('decayData')) as data_path:
@@ -179,6 +181,17 @@ for ikB in kB_e:
     Em_electron.append(line)
 
 
+micelle_E = []; micelle_S = []
+with importlib.resources.as_file(files('tdcrpy').joinpath('Micelle')) as data_path:
+    tamptxt = "faq01.csv"
+    fid = open(data_path / tamptxt)
+line = fid.readlines()
+for iline in line:
+    iline=iline.replace("\n","").split(";")
+    micelle_E.append(float(iline[0]))
+    micelle_S.append([float(x) for x in iline[1:]])
+micelle_S = np.asarray(micelle_S)
+
 """
 ======= Library of functions =======
 """
@@ -712,9 +725,11 @@ def readBetaShape(rad,mode,level,z=z_betashape):
             p.append(p0 * (e[k+1])-e[k])
         else:
             p.append(p0 * (e[k]-e[k-1]))
-            
+
+    e=(np.asarray(e[:-1])+np.asarray(e[1:]))/2
+    p.pop(-1)
     p /= sum(np.asarray(p)) # normalization
-    p = list(p)
+    p = list(p); e = list(e)
     return e, p
 
 
@@ -963,9 +978,40 @@ def Em_e(Ei, Ed, kB, nE, Et = Einterp_e*1e3, kB_vec = kB_e):
     return r
 
 
+#============================================================================================
 
+#============================================================================================
+
+#========================= Reverse micelle treatment ========================================
 
+def micelleLoss(E,*, fAq=fAq, diam_micelle=diam_micelle, e_vec=micelle_E, data=micelle_S):
+    """
+    Estimation of the energy deposited ratio due to loss in reversed micelles.
+    The function carries out interpolation in values estimated with GENAT4-DNA
+    in: Nedjadi et al. Applied Radiation and Isotopes, Volume 125, 2017, Pages 94-107,
+    https://doi.org/10.1016/j.apradiso.2017.04.020
+    
+    Parameters
+    ----------
+    E : float
+        Initial energy of the electron. (in keV)
+    fAq : float, optional
+        Aqueous fraction. The default is fAq.    
+    diam_micelle : float, optional
+        Diameter of micelles (in nm). The default is diam_micelle.    
+    e_vec : list, optional
+        Tabulated data of considered energies (in eV). The default is micelle_E.    
+    data : list, optional
+        Tabulated data of energy deposited ratio. The default is micelle_S.
 
+    Returns
+    -------
+    S : float
+        energy deposited ratio (keV)
+    """
+    micDiam = np.array([0.5, 1.0, 2.0, 3.0, 4.0]) #nm
+    S=np.interp(E*1e3, e_vec, micelle_S[:,np.argwhere(micDiam==diam_micelle)[0][0]])*(1-fAq)/0.9
+    return S
 
 
 #============================================================================================
@@ -2333,12 +2379,13 @@ def modelAnalytical(L,TD,TAB,TBC,TAC,rad,kB,V,mode,mode2,ne):
     
     """
     
-    # e, p = readBetaShape(rad, 'beta-', 'tot')
-    e, p = readBetaSpectra(rad)
+    e, p = readBetaShape(rad, 'beta-', 'tot')
+    # e, p = readBetaSpectra(rad)
     em=np.empty(len(e))
     for i, ei in enumerate(e):
-        ed = energie_dep_beta(ei)
-        em[i] = E_quench_e(ed*1e3,ed*1e3,kB*1e3,ne)*1e-3
+        # ed = energie_dep_beta2(ei,V)
+        # em[i] = E_quench_e(ei*1e3,ed*1e3,kB*1e3,ne)*1e-3
+        em[i] = Em_e(ei*1e3,ed*1e3,kB*1e3,ne)*1e-3
         
         
     if mode2=="sym":

tdcrpy/config.toml

@@ -32,6 +32,13 @@ pN = 0.000302
 pO = 0.082022
 pP = 0.000092
 pCl = 0.000071
+# properties on reverse micelles
+# applied reverse micelle correction
+micCorr = True
+# diameter of the micelles in nm (possible values: 0.5, 1.0, 2.0, 3.0, 4.0)
+diam_micelle = 2
+# acqueous fraction of the scintillator
+fAq = 0.1
 
 ## PROPERTIES OF THE COUNTER
 # Coincidence resolving time (ns)
@@ -42,4 +49,4 @@ tau = 50
 depthSpline = 5
 # energy (in keV) above which interpolation is applied.
 Einterp_a = 100
-Einterp_e = 1
+Einterp_e = 1.5