TDCRPy 2.14.0__py3-none-any.whl → 2.15.1__py3-none-any.whl

tdcrpy/TDCRPy.py

@@ -1039,7 +1039,7 @@ def objectFct(L, TD, Rad, pmf_1, N, kB, V):
     
     return res
 
-def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False):
+def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False, Lbounds=[0.1, 10]):
     """
     Caclulation of the efficiency of a TDCR system based on the model TDCRPy.
     This function includes optimization procedures from scipy.
@@ -1108,8 +1108,8 @@ def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False)
     
     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.01, 50), options={'disp': disp, 'maxiter':maxiter})
-    else: r=opt.minimize_scalar(objectFct, args=(TD[0], Rad, pmf_1, N, kB, V), method='bounded', bounds = (0.01, 50), options={'disp': disp, 'maxiter':maxiter})
+    if symm: r=opt.minimize_scalar(objectFct, args=(TD, Rad, pmf_1, N, kB, V), method='bounded', bounds = (Lbounds[0], Lbounds[1]), options={'disp': disp, 'maxiter':maxiter})
+    else: r=opt.minimize_scalar(objectFct, args=(TD[0], Rad, pmf_1, N, kB, V), method='bounded', bounds = (Lbounds[0], Lbounds[1]), options={'disp': disp, 'maxiter':maxiter})
     L0=r.x
     L=(L0, L0, L0)
     print(f"global free parameter = {L0} keV-1")
@@ -1139,7 +1139,7 @@ def eff(TD, Rad, pmf_1, kB, V, N=10000, L=1, maxiter=20, xatol=1e-7, disp=False)
     return L0, L, eff_S, u_eff_S, eff_D, u_eff_D, eff_T, u_eff_T, eff_AB, u_eff_AB, eff_BC, u_eff_BC, eff_AC, u_eff_AC, eff_D2, u_eff_D2
 
 
-def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False):
+def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False, Lbounds=[0.1, 10]):
     """
     Caclulation of the efficiency of a TDCR system based on the model TDCRPy (analytical model).
     This function includes optimization procedures from scipy.
@@ -1204,8 +1204,8 @@ def effA(TD, Rad, pmf_1, kB, V, L=1, maxiter=20, xatol=1e-7, disp=False):
     else:
         symm = True
 
-    if symm: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD, TD, TD, TD, Rad, kB, V, "res", 1e3), method='bounded', bounds = (0.01, 50), options={'disp': disp, 'maxiter':maxiter})
-    else: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "res", 1e3), method='bounded', bounds = (0.01, 50), options={'disp': disp, 'maxiter':maxiter})
+    if symm: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD, TD, TD, TD, Rad, kB, V, "res", 1e3), method='bounded', bounds = (Lbounds[0], Lbounds[1]), options={'disp': disp, 'maxiter':maxiter})
+    else: r=opt.minimize_scalar(tl.modelAnalytical, args=(TD[0], TD[1], TD[2], TD[3], Rad, kB, V, "res", 1e3), method='bounded', bounds = (Lbounds[0], Lbounds[1]), options={'disp': disp, 'maxiter':maxiter})
     L0=r.x
     L=(L0, L0, L0)
     print(f"global free parameter = {L0} keV-1")

{tdcrpy-2.14.0.dist-info → tdcrpy-2.15.1.dist-info}/METADATA

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

{tdcrpy-2.14.0.dist-info → tdcrpy-2.15.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tdcrpy/TDCRPy.py,sha256=AoeU2bb87Kjh61-hC7YfP8nRzNZFJcuTeKWYQtINHsY,67871
+tdcrpy/TDCRPy.py,sha256=3puNWaySzWsCg08OYzI89rWRy5f2CV2aa5HuC0tVCFM,67965
 tdcrpy/TDCRPy1.py,sha256=QTBZh5B5JWnGB0BQfD-cFmwA9W080OD4sG-aj50-ejo,38106
 tdcrpy/TDCR_model_lib.py,sha256=F2n2yB20WQ2ivBgjnmUOZ0sVmilMSYxmYSjnUxR_UDU,138156
 tdcrpy/TDCRoptimize.py,sha256=c2XIGveeLdVYYek4Rg6dygMvVA2xIrIkMb3L-_jUucM,6496
@@ -65,7 +65,7 @@ tdcrpy/Quenching/inputVecteurAlpha.txt,sha256=ee4emplX51vhomC7cGNP_eE5eqS9By5PaS
 tdcrpy/Quenching/inputVecteurElectron.txt,sha256=5NBRBaiB7op1SJ6v952w9gFKqh0x83pn8zYcoUpy33Y,181498
 tdcrpy/decayData/All-nuclides_BetaShape.zip,sha256=4aTyDeOLFWAWjfkmr7Fk5xHtsva3RTAUq-8_ii6fLf0,7881260
 tdcrpy/decayData/All-nuclides_Ensdf.zip,sha256=GL-X_IG6x4ykGrWYaMiZrjfMXOvYPM07G-Cp8WCPOu8,437902
-tdcrpy/decayData/All-nuclides_PenNuc.zip,sha256=DmhS2CYegWhL8qggc_MO6FgyiXE5qX73dOoH-SSQXoo,388954
+tdcrpy/decayData/All-nuclides_PenNuc.zip,sha256=OTkxdZ0ht3L-0uJ22Gekwlot9vMtVvK13eVJybNRXcU,389270
 tdcrpy/decayData/atom-ENDF-VII0.zip,sha256=oP4Z7qWweWF4j12QAIfvLFLlqeY1RomXwXD2iFgQCqo,1624444
 tdcrpy/decayData/photo-ENDF.zip,sha256=eOiVUt6OKGl0a3pErfaibZzF_yoSzswdUCTbnGNlu7g,249674
 tdcrpy/docs/_build/html/genindex.html,sha256=FopjoEyhTbeh7qOem-A7er-6yCIfdhv1BIzs9dJocCc,2522
@@ -75,8 +75,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.14.0.dist-info/licenses/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
-tdcrpy-2.14.0.dist-info/METADATA,sha256=aob1vzFWDXOdG5fQhrVAH0W2usryUbrZXBdxPY_6dKI,45312
-tdcrpy-2.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tdcrpy-2.14.0.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
-tdcrpy-2.14.0.dist-info/RECORD,,
+tdcrpy-2.15.1.dist-info/licenses/LICENCE.md,sha256=ZTpWyGU3qv_iwEpgvCijoCuCYpOPpyzJCgOk46WpUKU,1066
+tdcrpy-2.15.1.dist-info/METADATA,sha256=QPYpicHY8ouYjygTFCnIQTJCbdkCfrztUDhH_7FBCB4,45312
+tdcrpy-2.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tdcrpy-2.15.1.dist-info/top_level.txt,sha256=f4vzFFcKSEnonAACs0ZXuRczmroLLqtPTqXFymU_VU0,14
+tdcrpy-2.15.1.dist-info/RECORD,,