AOT-biomaps 2.9.224__py3-none-any.whl → 2.9.225__py3-none-any.whl

AOT_biomaps/AOT_Recon/PrimalDualRecon.py

@@ -85,7 +85,7 @@ class PrimalDualRecon(AlgebraicRecon):
                 else:
                     self.reconLaser = data
             # Essayer de charger les indices
-            base_dir, file_name = os.path.split(recon_path)
+            base_dir, _ = os.path.split(recon_path)
             indices_path = os.path.join(base_dir, "indices.npy")
             if os.path.exists(indices_path):
                 indices_data = np.load(indices_path, allow_pickle=True)
@@ -104,7 +104,7 @@ class PrimalDualRecon(AlgebraicRecon):
             opt_name = optimizer.value if optimizer is not None else self.optimizer.value
             # Find the most recent results directory if no date is specified
             dir_pattern = f'results_*_{opt_name}'
-            if opt_name == OptimizerType.CP_TV or opt_name == OptimizerType.CP_KL:
+            if opt_name == OptimizerType.CP_TV.value or opt_name == OptimizerType.CP_KL.value:
                 dir_pattern += f'_Alpha_{self.alpha}_Theta_{self.theta}_L_{self.L}'
             if results_date is None:
                 dirs = [d for d in os.listdir(self.saveDir) if os.path.isdir(os.path.join(self.saveDir, d)) and dir_pattern in d]
@@ -114,7 +114,7 @@ class PrimalDualRecon(AlgebraicRecon):
                 results_dir = os.path.join(self.saveDir, dirs[0])
             else:
                 results_dir = os.path.join(self.saveDir, f'results_{results_date}_{opt_name}')
-                if opt_name == OptimizerType.CP_TV or opt_name == OptimizerType.CP_KL:
+                if opt_name == OptimizerType.CP_TV.value or opt_name == OptimizerType.CP_KL.value:
                     results_dir += f'_Alpha_{self.alpha}_Theta_{self.theta}_L_{self.L}'
                 if not os.path.exists(results_dir):
                     raise FileNotFoundError(f"Directory {results_dir} does not exist.")
@@ -147,7 +147,6 @@ class PrimalDualRecon(AlgebraicRecon):
                 self.indices = None
             print(f"Loaded reconstruction results and indices from {results_dir}")
 
-
     def _convexReconPython(self, withTumor):
         if self.optimizer == OptimizerType.CP_TV:
             if withTumor:

AOT_biomaps/__init__.py

@@ -82,7 +82,7 @@ from .AOT_Recon.AOT_PotentialFunctions.RelativeDifferences import *
 from .Config import config
 from .Settings import *
 
-__version__ = '2.9.224'
+__version__ = '2.9.225'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -259,5 +259,6 @@ def initialize(process=None):
 
 
 
+
 
 

{aot_biomaps-2.9.224.dist-info → aot_biomaps-2.9.225.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AOT_biomaps
-Version: 2.9.224
+Version: 2.9.225
 Summary: Acousto-Optic Tomography
 Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
 Author: Lucas Duclos

{aot_biomaps-2.9.224.dist-info → aot_biomaps-2.9.225.dist-info}/RECORD

@@ -1,6 +1,6 @@
 AOT_biomaps/Config.py,sha256=ghEOP1n8aO1pR-su13wMeAZAxZRfry5hH67NbtZ8SqI,3614
 AOT_biomaps/Settings.py,sha256=v8fPhnvvcfBJP29m1RLOTEr3jndGLGwbUiORXmsj2Bo,2853
-AOT_biomaps/__init__.py,sha256=S1eVXvx7yN1VXnVtA4rthl32qYfLaUDazksHVLpjoUI,4318
+AOT_biomaps/__init__.py,sha256=phtdM9B_fzAS1PveD0B0ngkv3yh9EQt0SE0SNF_vJUo,4320
 AOT_biomaps/AOT_Acoustic/AcousticEnums.py,sha256=s5kXa6jKzbS4btwbubrVcynLOr0yg5tth5vL_FGfbMk,1802
 AOT_biomaps/AOT_Acoustic/AcousticTools.py,sha256=al7xXKMY5e-qQQ7nrQVPVAmqYiB320OluNlY6ti8iKc,7539
 AOT_biomaps/AOT_Acoustic/FocusedWave.py,sha256=3kGKKDx_3Msy5COYqIwzROPORGWvNjw8UsDanBfkMXE,11037
@@ -22,7 +22,7 @@ AOT_biomaps/AOT_Recon/AlgebraicRecon.py,sha256=66QWpX3KeNC05IqQh-SzxNz5z1JBo7BO2
 AOT_biomaps/AOT_Recon/AnalyticRecon.py,sha256=vjeTUnaZrtnLHnx6goseeJsd165KbSugQYwUXJFXapU,7596
 AOT_biomaps/AOT_Recon/BayesianRecon.py,sha256=gJVSPjt94g40hmSEaVm4LBbQ3B-FgyDk3iey9OOi3bk,16427
 AOT_biomaps/AOT_Recon/DeepLearningRecon.py,sha256=RfVcEsi4GeGqJn0_SPxwQPQx6IQjin79WKh2UarMRLI,1383
-AOT_biomaps/AOT_Recon/PrimalDualRecon.py,sha256=fM38hQZjyGFTFWjkCSpdDazSAE7gR6cSOdsiQhHQUzg,10218
+AOT_biomaps/AOT_Recon/PrimalDualRecon.py,sha256=6d0upWIbJOMcN0YrOIxxsp6Hzo82bm-l4DXsBLmqdAM,10232
 AOT_biomaps/AOT_Recon/ReconEnums.py,sha256=oyT9qIfEpE_ChPQihM8-6b0UOtNmuE4weUpO8lJCB38,18641
 AOT_biomaps/AOT_Recon/ReconTools.py,sha256=zPGwoDHX5H7v78onHAlFwZ8OdjZVsX6PAJFrTiikqEc,10608
 AOT_biomaps/AOT_Recon/__init__.py,sha256=LDbNpsjS8_TJrXMKzkpzSAj5trVuCW57AWQaJBrzd0I,244
@@ -37,7 +37,7 @@ AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Huber.py,sha256=dRd1t5OBag_gVmfji3L
 AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Quadratic.py,sha256=wTbzcXxMdEl9ReEXrL43DOJQecokBwJYU_s2kQUASZY,2545
 AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/RelativeDifferences.py,sha256=ZlWaKsNPCMfy4fWxYFT2pSoKMbysQkJH4N1WbbWncq4,2493
 AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/__init__.py,sha256=RwrJdLOFbAFBFnRxo5xdlOyeZgtQRDaRWDN9-uCGUiY,84
-aot_biomaps-2.9.224.dist-info/METADATA,sha256=4huRaGkhsJE5Usj2kS3HnTgyvebo0nLWdjLu0uQlco8,663
-aot_biomaps-2.9.224.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aot_biomaps-2.9.224.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
-aot_biomaps-2.9.224.dist-info/RECORD,,
+aot_biomaps-2.9.225.dist-info/METADATA,sha256=9yYwR_mI8Kz3leZ6wcUczPqi-jFuIc3L4r1o5CbVdnM,663
+aot_biomaps-2.9.225.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aot_biomaps-2.9.225.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
+aot_biomaps-2.9.225.dist-info/RECORD,,