TDCRPy 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

{TDCRPy-2.0.0.dist-info → TDCRPy-2.0.2.dist-info}/METADATA

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

{TDCRPy-2.0.0.dist-info → TDCRPy-2.0.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=MBIIarFldIoz1BOyWlB_5rKA_5NMed2QQfM-2xqJnUg,61031
+tdcrpy/TDCRPy.py,sha256=Q6ksEJQvjNgbcWPiWFAcT0QDBCN2x5lHs_W4Leh7KO0,61092
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=I8AOboq9sgCnkMpu871RTABgxvUg-OwBNzL20EARJpo,124068
+tdcrpy/TDCR_model_lib.py,sha256=gnWWLG96hdT0uFkL0sE4CMuXNcP6DTQ3S3Jq_jwnYMg,125487
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
 tdcrpy/__init__.py,sha256=9Djir8dPNchcJVQvhl-oRHEOsoDkiZlkOhWT-eHR7wQ,95
 tdcrpy/config.toml,sha256=d_olKEgxfobBHkZ2wEj9EgKE7I8Wbpim9ZAsi5ImFxk,1470
@@ -1081,8 +1081,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=JINqSEMFoNpptE4f3h6ZzTYW1rBx90KkaoQzltSg-No,4692
-TDCRPy-2.0.0.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-2.0.0.dist-info/METADATA,sha256=VHpxRhIMAyLRXOcwjFkhQ-E0bVBk5yIQ_YsevRQorcY,15831
-TDCRPy-2.0.0.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
-TDCRPy-2.0.0.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-2.0.0.dist-info/RECORD,,
+TDCRPy-2.0.2.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+TDCRPy-2.0.2.dist-info/METADATA,sha256=FEl2Wv8r3dccx-1t4dCcsKKRtcDwVfxKzLxtlHyR3qM,15831
+TDCRPy-2.0.2.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
+TDCRPy-2.0.2.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+TDCRPy-2.0.2.dist-info/RECORD,,

tdcrpy/TDCRPy.py

@@ -1096,6 +1096,8 @@ def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False)
     else:
         symm = True
     
+    TDCRPy(L, Rad, pmf_1, N, kB, V, record = True)
+       
     if symm: r=opt.minimize_scalar(objectFct, args=(TD, Rad, pmf_1, N, kB, V), method='bounded', bounds = (0.1, 5), options={'disp': disp, 'maxiter':maxiter})
     else: r=opt.minimize_scalar(objectFct, args=(TD[0], Rad, pmf_1, N, kB, V), method='bounded', bounds = (0.1, 5), options={'disp': disp, 'maxiter':maxiter})
     L0=r.x
@@ -1128,10 +1130,10 @@ def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False)
 
 
 # # L = 1
-# # L = (1.1, 1.05, 1.15)
-# # TD = 0.977667386529166
+# L = (1.1, 1.05, 1.15)
+# # # TD = 0.977667386529166
 # TD = (0.977667386529166, 0.992232838598821, 0.992343419459002, 0.99275350064608)
-# # TD = (0.977667386529166, 0.995232838598821, 0.990343419459002, 0.99275350064608)
+# # # TD = (0.977667386529166, 0.995232838598821, 0.990343419459002, 0.99275350064608)
 # Rad="Co-60"
 # pmf_1="1"
 # N = 1000

tdcrpy/TDCR_model_lib.py

@@ -3057,8 +3057,40 @@ def efficienciesEstimates(efficiency_S, efficiency_D, efficiency_T, efficiency_A
     return mean_efficiency_S, std_efficiency_S, mean_efficiency_D, std_efficiency_D, mean_efficiency_T, std_efficiency_T, mean_efficiency_AB, std_efficiency_AB, mean_efficiency_BC, std_efficiency_BC, mean_efficiency_AC, std_efficiency_AC, mean_efficiency_D2, std_efficiency_D2
     
 
-
-
+def readRecQuenchedEnergies():
+    temp_dir = tempfile.gettempdir()
+    recfile3 = os.path.join(temp_dir, "Temp_E2.txt")
+    with open(recfile3, "r") as file:
+        Epromt, Edelayed = [], []
+        decaym = -1
+        e_quenching = []; e_quenching2 = []; evenement=1; t1=0
+        for line in file:
+            if line[0] != "#":
+                line = line.split(' ')
+                line = [element for element in line if element != ""]
+                decay = int(line[2])                
+                if decay != decaym:
+                    if decay>0:
+                        Epromt.append(sum(e_quenching))
+                        Edelayed.append(sum(e_quenching2))
+                        
+                        
+                        energy = float(line[1])*1e-3
+                        t1 = float(line[4])
+                        decaym = decay
+                        e_quenching = []; e_quenching2 = []
+                        evenement=1
+                        e_quenching.append(energy)
+                else:
+                    energy = float(line[1])*1e-3
+                    t1 = float(line[4])
+                    # print(decay, energy, t1, extDT)
+                    if t1 > tau*1e-9:
+                        evenement = evenement + 1
+                        e_quenching2.append(energy)
+                    else:
+                        e_quenching.append(energy)
+    return Epromt, Edelayed
 
 # N = 1e7
 # buildBetaSpectra('H-3', 16, N, prt=True); print('H-3 - done')