TDCRPy 1.12.13__py3-none-any.whl → 1.12.15__py3-none-any.whl

{TDCRPy-1.12.13.dist-info → TDCRPy-1.12.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TDCRPy
-Version: 1.12.13
+Version: 1.12.15
 Summary: TDCR model
 Home-page: https://pypi.org/project/TDCRPy/
 Author: RomainCoulon (Romain Coulon)

{TDCRPy-1.12.13.dist-info → TDCRPy-1.12.15.dist-info}/RECORD

@@ -1,6 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=zdUZAf00Tm3Oy09G2A4tkfLYhZkj-ep67mL5FrfS-sM,65543
+tdcrpy/TDCRPy.py,sha256=D3NCFJP0n7b7dbg53F-d79p6xMR6_14W52Qd7v6A7uo,65356
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=Vqbd-JVhGdF9BzW9axYwCHl2MOBfupCJ1ih5Nz_aXts,106906
+tdcrpy/TDCR_model_lib.py,sha256=M4gFN5QVqEeRp46FrZJpG9ytv99FZl2RTwoU9nc91Go,110702
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=vQslGLsoZPIceaitnSHOqN6lUdjEyJ3YhfJ6tYdXt-s,127
 tdcrpy/config.toml,sha256=d_olKEgxfobBHkZ2wEj9EgKE7I8Wbpim9ZAsi5ImFxk,1470
@@ -1079,14 +1079,10 @@ tdcrpy/docs/_build/html/index.html,sha256=KbgBWH_0ixaswXk_lCM_pMk10v4rLs5qdPubj2
 tdcrpy/docs/_build/html/search.html,sha256=IeTP6CsRdqKWOJttbtskg1oBgdN8norKlzai4Tmk8Kc,2799
 tdcrpy/docs/_build/html/source/modules.html,sha256=Jf-qxVBId0UgpwyvYuyjtMNG-ezPOK1oH_IxRXAWTRs,3601
 tdcrpy/docs/_build/html/source/tdcrpy.html,sha256=-38lHMNFB22p1tWJEeN3yDqfDiCYE304vxDamO1-iRc,3779
-tdcrpy/recordFiles/Temp_E0.txt,sha256=I8lJwaMRmBaHPlN7of3ieycfk4gaMT7j2ZJpJvxnVxM,980
-tdcrpy/recordFiles/Temp_E1.txt,sha256=pYitCNjrVK1vfpGTxycgNB1cWZIWj2rwUnFw1KLNa5M,983
-tdcrpy/recordFiles/Temp_E2.txt,sha256=nHzLeX6f7bOerL0LZSWCO6zg2WgA8tqDwPhMyUsI85w,992
-tdcrpy/recordFiles/Temp_E3.txt,sha256=mmg3kPoW5EXXCn8XHbRqDTt1vRHz_q5uVXRMAQvrTIU,902
 tdcrpy/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tdcrpy/test/test_tdcrpy.py,sha256=JINqSEMFoNpptE4f3h6ZzTYW1rBx90KkaoQzltSg-No,4692
-TDCRPy-1.12.13.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.12.13.dist-info/METADATA,sha256=Jsiz9os_184vLMBQZ6NkXuQQGCE138ik61N0yBEvlbg,15833
-TDCRPy-1.12.13.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-TDCRPy-1.12.13.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.12.13.dist-info/RECORD,,
+TDCRPy-1.12.15.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-1.12.15.dist-info/METADATA,sha256=K6QZZkIGsPacCsrhrwnD6c1--PB5dNgsI-rhS_leirQ,15833
+TDCRPy-1.12.15.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+TDCRPy-1.12.15.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-1.12.15.dist-info/RECORD,,

tdcrpy/TDCRPy.py

@@ -15,6 +15,8 @@ from importlib.resources import files
 import configparser
 import numpy as np
 from tqdm import tqdm
+import tempfile
+import os
 
 def relaxAtom(daughter_relax,particle_vec,energy_vec,rad,Display=False,uncData=False):
          
@@ -167,8 +169,8 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
         Standard uncertainty from calculation associated with the estimation of the efficiency of double coincidences for C/N systems. (only in mode="eff")
     """
     if record:
-        # recfile1 = "recordFiles/"+Rad+"_"+pmf_1+"_"+str(N)+".dhf1"
-        recfile1 = "recordFiles/Temp_E0.txt"
+        temp_dir = tempfile.gettempdir()
+        recfile1 = os.path.join(temp_dir, "Temp_E0.txt")
         header_content1 = """# TDCRPy output: inital energies from nuclear decays
 # Column 1: KPAR (1=electron, 2=photon, 3=positron, 4=alpha)
 # Column 2: Energy in eV  (> ECNUC)
@@ -177,10 +179,9 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
 # Column 5: Particle age in seconds (since decay started)
 # 2            3  4 5
 """
-        with open(recfile1, "w") as file: file.write(header_content1)
+        with open(recfile1, 'w') as file: file.write(header_content1)
 
-        # recfile2 = "recordFiles/"+Rad+"_"+pmf_1+"_"+str(N)+".dhf2"
-        recfile2 = "recordFiles/Temp_E1.txt"
+        recfile2 = os.path.join(temp_dir, "Temp_E1.txt")
         header_content2 = """# TDCRPy output: deposited energies from nuclear decays
 # Column 1: KPAR (1=electron, 2=photon, 3=positron, 4=alpha)
 # Column 2: Energy in eV  (> ECNUC)
@@ -191,8 +192,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
 """
         with open(recfile2, "w") as file: file.write(header_content2)
 
-        # recfile3 = "recordFiles/"+Rad+"_"+pmf_1+"_"+str(N)+".dhf3"
-        recfile3 = "recordFiles/Temp_E2.txt"
+        recfile3 = os.path.join(temp_dir, "Temp_E2.txt")
         header_content3 = """# TDCRPy output: deposited quenched energies from nuclear decays
 # Column 1: KPAR (1=electron, 2=photon, 3=positron, 4=alpha)
 # Column 2: Energy in eV  (> ECNUC)
@@ -210,8 +210,7 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
 # Column 4: detection probability if triple coincidences
 # 2 3 4
 """
-        # recfile4 = "recordFiles/"+Rad+"_"+pmf_1+"_"+str(N)+".dhf4"
-        recfile4 = "recordFiles/Temp_E3.txt"
+        recfile4 = os.path.join(temp_dir, "Temp_E3.txt")
         with open(recfile4, "w") as file: file.write(header_content4)
             
     if barp: tl.display_header()
@@ -995,7 +994,6 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
             """
             if record:
                 with open(recfile4, "a") as file:
-                    print(idec)
                     if mode2=="sym":
                         file.write(f"{idec} {efficiency_S[-1]} {efficiency_D[-1]} {efficiency_T[-1]}\n")
                     elif mode2=="asym":
@@ -1085,9 +1083,9 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
 # mode = "eff"
 # mode2 = "sym"
 
-# out = TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=True, barp=False,uncData=False)
-# print("TDCR", out[4]/out[2])
-# print("Eff D", out[2])
+# # out = TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=True, barp=False,uncData=False)
+# # print("TDCR", out[4]/out[2])
+# # print("Eff D", out[2])
 
 
 # out = TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, 20, kB, V, mode, mode2, Display=True, barp=False, Smodel=True, syst = "TDCR", record = "phf1", uncData=False)

tdcrpy/TDCR_model_lib.py

@@ -23,6 +23,7 @@ import os
 import scipy.interpolate as  interp
 import matplotlib.pyplot as plt
 from tqdm import tqdm
+import tempfile
 
 """
 ======= Import ressource data =======
@@ -168,6 +169,116 @@ def modifyMicCorr(x):
     data1 = data0.replace(f"micCorr = {x0}",f"micCorr= {x}")
     writeConfifAsstr(data1)
 
+def read_temp_files(copy=False, path="C:"):
+    
+    temp_dir = tempfile.gettempdir()
+    file_path1 = os.path.join(temp_dir, 'Temp_E0.txt')
+    file_path2 = os.path.join(temp_dir, 'Temp_E1.txt')
+    file_path3 = os.path.join(temp_dir, 'Temp_E2.txt')
+    file_path4 = os.path.join(temp_dir, 'Temp_E3.txt')
+    with open(file_path1, 'r') as temp_file: content1 = temp_file.read()
+    with open(file_path2, 'r') as temp_file: content2 = temp_file.read()
+    with open(file_path3, 'r') as temp_file: content3 = temp_file.read()
+    with open(file_path4, 'r') as temp_file: content4 = temp_file.read()
+    
+    if copy:
+        with open(path+'Temp_E0.txt', 'w') as temp_file: temp_file.write(content1)
+        with open(path+'Temp_E1.txt', 'w') as temp_file: temp_file.write(content2)
+        with open(path+'Temp_E2.txt', 'w') as temp_file: temp_file.write(content3)
+        with open(path+'Temp_E3.txt', 'w') as temp_file: temp_file.write(content4)      
+    
+    return content1, content2, content3, content4, 
+
+def energyVectors1(temp):
+    temp = temp.split("\n")
+    row_m = ""
+    ee_vec, eg_vec, ep_vec, ea_vec = [], [], [], []
+    ee=0; eg=0; ep=0; ea=0 
+    for row in temp:
+        if row=="": row = "#"
+        if row[0] != "#":
+            row = row.split(" ")
+            if "" in row: row.pop(2)
+            if row[0]=='1': ee+=float(row[1])*1e-3
+            if row[0]=='2': eg+=float(row[1])*1e-3
+            if row[0]=='3': ep+=float(row[1])*1e-3
+            if row[0]=='4': ea+=float(row[1])*1e-3
+            if row[2] != row_m:
+                ee_vec.append(ee)
+                eg_vec.append(eg)
+                ep_vec.append(ep)
+                ea_vec.append(ea)
+                eg=0; ee=0; ep=0; ea=0
+        #else: print(row)
+    ee_vec = [num for num in ee_vec if num != 0]
+    eg_vec = [num for num in eg_vec if num != 0]
+    ep_vec = [num for num in ep_vec if num != 0]
+    ea_vec = [num for num in ea_vec if num != 0]
+    return ee_vec, eg_vec, ep_vec, ea_vec
+
+def energyVectors2(temp):
+    temp = temp.split("\n")
+    row_m = ""
+    ee_vec, ep_vec, ea_vec = [], [], []
+    ee=0; ep=0; ea=0 
+    for row in temp:
+        if row=="": row = "#"
+        if row[0] != "#":
+            row = row.split(" ")
+            if "" in row: row.pop(2)
+            if row[0]=='1': ee+=float(row[1])*1e-3
+            if row[0]=='3': ep+=float(row[1])*1e-3
+            if row[0]=='4': ea+=float(row[1])*1e-3
+            if row[2] != row_m:
+                ee_vec.append(ee)
+                ep_vec.append(ep)
+                ea_vec.append(ea)
+                ee=0; ep=0; ea=0
+        #else: print(row)
+    ee_vec = [num for num in ee_vec if num != 0]
+    ep_vec = [num for num in ep_vec if num != 0]
+    ea_vec = [num for num in ea_vec if num != 0]
+    return ee_vec, ep_vec, ea_vec
+
+
+def energyVectors3(temp):
+    temp = temp.split("\n")
+    row_m = ""
+    ee_vec = []; ee=0 
+    for row in temp:
+        if row=="": row = "#"
+        if row[0] != "#":
+            row = row.split(" ")
+            if "" in row: row.pop(2)
+            ee+=float(row[1])*1e-3
+            if row[2] != row_m:
+                ee_vec.append(ee)
+                ee=0
+        #else: print(row)
+    ee_vec = [num for num in ee_vec if num != 0]
+    return ee_vec
+
+def effVector(temp):
+    temp = temp.split("\n")
+    row_m = ""
+    s_vec, d_vec, t_vec = [], [], []
+    s=0; d=0; t=0 
+    for row in temp:
+        if row=="": row = "#"
+        if row[0] != "#":
+            row = row.split(" ")
+            s+=float(row[1])
+            d+=float(row[2])
+            t+=float(row[3])
+            if row[0] != row_m:
+                s_vec.append(s)
+                d_vec.append(d)
+                t_vec.append(t)
+                s=0; d=0; t=0
+        #else: print(row)
+    return s_vec, d_vec, t_vec
+
+
 # import PenNuc data
 with importlib.resources.as_file(files('tdcrpy').joinpath('decayData')) as data_path:
 #with importlib.resources.path('tdcrpy', 'decayData') as data_path:

tdcrpy/recordFiles/Temp_E0.txt

@@ -1,37 +0,0 @@
-# TDCRPy output: inital energies from nuclear decays
-# Column 1: KPAR (1=electron, 2=photon, 3=positron, 4=alpha)
-# Column 2: Energy in eV  (> ECNUC)
-# Column 3: Decay number mod 100, two digits
-# Column 4: Cascade number mod 10, one digit
-# Column 5: Particle age in seconds (since decay started)
-# 2            3  4 5
-1 8.900000E+04  0 1 0
-1 3.620000E+05  1 1 0
-1 1.210000E+05  2 1 0
-1 3.000000E+03  3 1 0
-2 2.083662E+05  3 1 0
-1 4.759900E+04  3 1 0
-2 5.579090E+04  3 1 0
-1 7.750000E+03  3 1 0
-1 6.100000E+04  4 1 0
-2 2.083662E+05  4 1 0
-1 1.024262E+05  4 1 0
-1 7.750000E+03  4 1 0
-1 2.350000E+05  5 1 0
-1 2.280000E+05  6 1 0
-1 1.800000E+05  7 1 0
-1 3.150000E+05  8 1 0
-1 4.200000E+04  9 1 0
-1 6.000000E+03 10 1 0
-1 1.010000E+05 11 1 0
-1 6.100000E+04 12 1 0
-1 3.230000E+05 13 1 0
-1 1.220000E+05 14 1 0
-1 4.400000E+04 15 1 0
-2 2.083662E+05 15 1 0
-1 1.024262E+05 15 1 0
-1 7.750000E+03 15 1 0
-1 4.700000E+04 16 1 0
-1 3.400000E+04 17 1 0
-1 9.900000E+04 18 1 0
-1 8.500000E+04 19 1 0

tdcrpy/recordFiles/Temp_E1.txt

@@ -1,37 +0,0 @@
-# TDCRPy output: deposited energies from nuclear decays
-# Column 1: KPAR (1=electron, 2=photon, 3=positron, 4=alpha)
-# Column 2: Energy in eV  (> ECNUC)
-# Column 3: Decay number mod 100, two digits
-# Column 4: Cascade number mod 10, one digit
-# Column 5: Particle age in seconds (since decay started)
-# 2            3  4 5
-1 8.900000E+04  0 1 0
-1 3.620000E+05  1 1 0
-1 1.210000E+05  2 1 0
-1 3.000000E+03  3 1 0
-1 0.000000E+00  3 1 0
-1 4.759900E+04  3 1 0
-1 1.283191E+04  3 1 0
-1 7.750000E+03  3 1 0
-1 6.100000E+04  4 1 0
-1 0.000000E+00  4 1 0
-1 1.024262E+05  4 1 0
-1 7.750000E+03  4 1 0
-1 2.350000E+05  5 1 0
-1 2.280000E+05  6 1 0
-1 1.800000E+05  7 1 0
-1 2.125648E+05  8 1 0
-1 4.200000E+04  9 1 0
-1 6.000000E+03 10 1 0
-1 1.010000E+05 11 1 0
-1 6.100000E+04 12 1 0
-1 3.230000E+05 13 1 0
-1 1.220000E+05 14 1 0
-1 4.400000E+04 15 1 0
-1 0.000000E+00 15 1 0
-1 1.024262E+05 15 1 0
-1 7.750000E+03 15 1 0
-1 4.700000E+04 16 1 0
-1 3.400000E+04 17 1 0
-1 9.900000E+04 18 1 0
-1 8.500000E+04 19 1 0

tdcrpy/recordFiles/Temp_E2.txt

@@ -1,37 +0,0 @@
-# TDCRPy output: deposited quenched energies from nuclear decays
-# Column 1: KPAR (1=electron, 2=photon, 3=positron, 4=alpha)
-# Column 2: Energy in eV  (> ECNUC)
-# Column 3: Decay number mod 100, two digits
-# Column 4: Cascade number mod 10, one digit
-# Column 5: Particle age in seconds (since decay started)
-# 2            3  4 5
-1 7.256485E+04  0 1 0
-1 3.126531E+05  1 1 0
-1 1.004394E+05  2 1 0
-1 1.350593E+03  3 1 0
-1 0.000000E+00  3 1 0
-1 3.690230E+04  3 1 0
-1 1.095075E+04  3 1 0
-1 4.466165E+03  3 1 0
-1 4.836887E+04  4 1 0
-1 0.000000E+00  4 1 0
-1 8.423896E+04  4 1 0
-1 4.466165E+03  4 1 0
-1 2.005481E+05  5 1 0
-1 1.943812E+05  6 1 0
-1 1.521483E+05  7 1 0
-1 1.870476E+05  8 1 0
-1 3.214612E+04  9 1 0
-1 3.252983E+03 10 1 0
-1 8.299727E+04 11 1 0
-1 4.836887E+04 12 1 0
-1 2.781928E+05 13 1 0
-1 1.013130E+05 14 1 0
-1 3.384221E+04 15 1 0
-1 0.000000E+00 15 1 0
-1 8.423896E+04 15 1 0
-1 4.466165E+03 15 1 0
-1 3.639232E+04 16 1 0
-1 2.540040E+04 17 1 0
-1 8.125656E+04 18 1 0
-1 6.909427E+04 19 1 0

tdcrpy/recordFiles/Temp_E3.txt

@@ -1,26 +0,0 @@
-# TDCRPy output: detection probabilities
-# Column 1: Decay number mod 100, two digits
-# Column 2: detection probability of single events
-# Column 3: detection probability if double coincidences
-# Column 4: detection probability if triple coincidences
-# 2 3 4
-0 1.0 0.9999999999999998 0.9999999999061827
-1 1.0 1.0 1.0
-2 1.0 1.0 0.9999999999999913
-3 1.0 0.9999999999999991 0.999999948994126
-4 1.0 1.0 1.0
-5 1.0 1.0 1.0
-6 1.0 1.0 1.0
-7 1.0 1.0 1.0
-8 1.0 1.0 1.0
-9 0.999999999999989 0.9999999985213657 0.9999333984161588
-10 0.9613412941994496 0.7343237230821587 0.2899479433902926
-11 1.0 1.0 0.9999999999971023
-12 1.0 0.99999999999997 0.999999701455034
-13 1.0 1.0 1.0
-14 1.0 1.0000000000000002 0.9999999999999937
-15 1.0 1.0 1.0
-16 0.9999999999999999 0.9999999999128106 0.99998382697656
-17 0.9999999999906943 0.9999998672938257 0.9993691221325874
-18 1.0 1.0 0.9999999999948235
-19 1.0 1.0 0.9999999997016666