TDCRPy 1.12.12__tar.gz → 1.12.14__tar.gz

{tdcrpy-1.12.12/TDCRPy.egg-info → tdcrpy-1.12.14}/PKG-INFO

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

{tdcrpy-1.12.12 → tdcrpy-1.12.14/TDCRPy.egg-info}/PKG-INFO

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

{tdcrpy-1.12.12 → tdcrpy-1.12.14}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = "1.12.12"
+VERSION = "1.12.14"
 
 DESCRIPTION = "TDCR model"
 

{tdcrpy-1.12.12 → tdcrpy-1.12.14}/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,7 +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"
+        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)
@@ -176,9 +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 = 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)
@@ -189,7 +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 = 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)
@@ -207,7 +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 = os.path.join(temp_dir, "Temp_E3.txt")
         with open(recfile4, "w") as file: file.write(header_content4)
             
     if barp: tl.display_header()
@@ -1068,22 +1071,22 @@ def TDCRPy(L, TD, TAB, TBC, TAC, Rad, pmf_1, N, kB, V, mode, mode2, Display=Fals
 
 # print(out)
 
-L = 1
-TD = 0.977667386529166
-TAB = 0.992232838598821
-TBC = 0.992343419459002
-TAC = 0.99275350064608
-Rad="Lu-177"
-pmf_1="1"
-N = 1000
-kB =1.0e-5
-V = 10
-mode = "eff"
-mode2 = "sym"
+# L = 1
+# TD = 0.977667386529166
+# TAB = 0.992232838598821
+# TBC = 0.992343419459002
+# TAC = 0.99275350064608
+# Rad="Lu-177"
+# pmf_1="1"
+# N = 1000
+# kB =1.0e-5
+# V = 10
+# 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)
+# 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-1.12.12 → tdcrpy-1.12.14}/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,26 @@ 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, 
+
 # import PenNuc data
 with importlib.resources.as_file(files('tdcrpy').joinpath('decayData')) as data_path:
 #with importlib.resources.path('tdcrpy', 'decayData') as data_path: