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

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

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

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

@@ -1,6 +1,6 @@
-tdcrpy/TDCRPy.py,sha256=6Lvttr2ULiLE25Zh4MUfsyKM9k0eZv0PhzGP_0Kmcnw,65388
+tdcrpy/TDCRPy.py,sha256=D3NCFJP0n7b7dbg53F-d79p6xMR6_14W52Qd7v6A7uo,65356
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
-tdcrpy/TDCR_model_lib.py,sha256=WYR2-z187MLDOHR_wdOGdOkKKLYuP2f1VE-pTQ3wAzc,107934
+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
@@ -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-1.12.14.dist-info/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-TDCRPy-1.12.14.dist-info/METADATA,sha256=zMqiloAvp2aN0UeMAUoG3VXP71N7ZhaCLIZJnOhlFBQ,15833
-TDCRPy-1.12.14.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-TDCRPy-1.12.14.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-TDCRPy-1.12.14.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

@@ -994,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":

tdcrpy/TDCR_model_lib.py

@@ -189,6 +189,96 @@ def read_temp_files(copy=False, path="C:"):
     
     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: