AOT-biomaps 2.9.222__py3-none-any.whl → 2.9.223__py3-none-any.whl

AOT_biomaps/AOT_Recon/BayesianRecon.py

@@ -100,7 +100,7 @@ class BayesianRecon(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)

AOT_biomaps/AOT_Recon/PrimalDualRecon.py

@@ -103,18 +103,19 @@ class PrimalDualRecon(AlgebraicRecon):
             # Determine optimizer name for path matching
             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 optimizer == OptimizerType.CP_TV or optimizer == OptimizerType.CP_KL:
+                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 re.match(r'results_\d{4}_' + re.escape(opt_name) + r'($|_)', d)
-                ]
+                dirs = [d for d in os.listdir(self.saveDir) if os.path.isdir(os.path.join(self.saveDir, d)) and dir_pattern in d]
                 if not dirs:
-                    raise FileNotFoundError(f"No results directory found for optimizer '{opt_name}' in {self.saveDir}.")
+                    raise FileNotFoundError(f"No matching results directory found for pattern '{dir_pattern}' in {self.saveDir}.")
                 dirs.sort(reverse=True)  # Most recent first
                 results_dir = os.path.join(self.saveDir, dirs[0])
             else:
                 results_dir = os.path.join(self.saveDir, f'results_{results_date}_{opt_name}')
+                if optimizer == OptimizerType.CP_TV or optimizer == OptimizerType.CP_KL:
+                    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.")
             # Load reconstruction results

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.222'
+__version__ = '2.9.223'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -257,5 +257,6 @@ def initialize(process=None):
 
 
 
+
 
 

{aot_biomaps-2.9.222.dist-info → aot_biomaps-2.9.223.dist-info}/METADATA

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

{aot_biomaps-2.9.222.dist-info → aot_biomaps-2.9.223.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=Ed7SmCRrVf_ndSt9-2p6TWNvxfj35J3TpNjeJ930Ixs,4314
+AOT_biomaps/__init__.py,sha256=h9fS6lzKLKafEEwjUXRqKEU3kNf0_lzkrIQotWLib_U,4316
 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
@@ -20,9 +20,9 @@ AOT_biomaps/AOT_Optic/__init__.py,sha256=HSUVhfz0NzwHHZZ9KP9Xyfu33IgP_rYJX86J-gE
 AOT_biomaps/AOT_Optic/_mainOptic.py,sha256=Wk63CcgWbU-ygMfjNK80islaUbGGJpTXgZY3_C2KQNY,8179
 AOT_biomaps/AOT_Recon/AlgebraicRecon.py,sha256=66QWpX3KeNC05IqQh-SzxNz5z1JBo7BO2eNg_2zBi8U,48102
 AOT_biomaps/AOT_Recon/AnalyticRecon.py,sha256=vjeTUnaZrtnLHnx6goseeJsd165KbSugQYwUXJFXapU,7596
-AOT_biomaps/AOT_Recon/BayesianRecon.py,sha256=J6QTCiyOKXD6Mnef-SXMf0syiTZ8_XCMBvh3zRXh8h8,16435
+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=7awUaKNkg1lOFittiiTPORvGIKThbhCe-zAr8rgTaGM,9940
+AOT_biomaps/AOT_Recon/PrimalDualRecon.py,sha256=G0P7W3t912zzf0zKxogRnBAhWoMl3JhDhy259fgjWb0,10222
 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.222.dist-info/METADATA,sha256=NO6901wSD1tR-rV_ThefPJ-PGHbvo6EqCWmkYQD34dg,663
-aot_biomaps-2.9.222.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aot_biomaps-2.9.222.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
-aot_biomaps-2.9.222.dist-info/RECORD,,
+aot_biomaps-2.9.223.dist-info/METADATA,sha256=mbA9Xt82vxLNP5zPA2amm7oaYugIdGeTI_Ta603uLmI,663
+aot_biomaps-2.9.223.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aot_biomaps-2.9.223.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
+aot_biomaps-2.9.223.dist-info/RECORD,,