AOT-biomaps 2.9.218__tar.gz → 2.9.220__tar.gz

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/AOT_biomaps/AOT_Recon/AlgebraicRecon.py

@@ -700,29 +700,46 @@ class AlgebraicRecon(Recon):
         if withTumor:
             if self.experiment.AOsignal_withTumor is None:
                 raise ValueError("AO signal with tumor is not available. Please generate AO signal with tumor the experiment first in the experiment object.")
-            else:
-                y = self.experiment.AOsignal_withTumor
         else:
             if self.experiment.AOsignal_withoutTumor is None:
                 raise ValueError("AO signal without tumor is not available. Please generate AO signal without tumor the experiment first in the experiment object.")
-            else:
-                y = self.experiment.AOsignal_withoutTumor
 
         if self.optimizer.value == OptimizerType.MLEM.value:
-            self.reconPhantom, self.indices = MLEM(SMatrix=self.SMatrix, 
-                                                    y=y,
-                                                    numIterations=self.numIterations,
-                                                    isSavingEachIteration=self.isSavingEachIteration,
-                                                    withTumor=withTumor,
-                                                    use_multi_gpu= self.isMultiGPU,
-                                                    use_numba= self.isMultiCPU,
-                                                    max_saves=self.maxSaves
-                                                    )
+            if withTumor:
+                self.reconPhantom, self.indices = MLEM(SMatrix=self.SMatrix, 
+                                                        y=self.experiment.AOsignal_withTumor,
+                                                        numIterations=self.numIterations,
+                                                        isSavingEachIteration=self.isSavingEachIteration,
+                                                        withTumor=withTumor,
+                                                        use_multi_gpu= self.isMultiGPU,
+                                                        use_numba= self.isMultiCPU,
+                                                        max_saves=self.maxSaves
+                                                        )
+            else:
+                self.reconLaser, self.indices = MLEM(SMatrix=self.SMatrix, 
+                                                        y=self.experiment.AOsignal_withoutTumor,
+                                                        numIterations=self.numIterations,
+                                                        isSavingEachIteration=self.isSavingEachIteration,
+                                                        withTumor=withTumor,
+                                                        use_multi_gpu= self.isMultiGPU,
+                                                        use_numba= self.isMultiCPU,
+                                                        max_saves=self.maxSaves
+                                                        )
         elif self.optimizer.value == OptimizerType.LS.value:
             if self.alpha is None:
                 raise ValueError("Alpha (regularization parameter) must be set for LS reconstruction.")
-            self.reconPhantom, self.indices = LS(SMatrix=self.SMatrix,
-                                                y=y, 
+            if withTumor:
+                self.reconPhantom, self.indices = LS(SMatrix=self.SMatrix,
+                                                y=self.experiment.AOsignal_withTumor, 
+                                                numIterations=self.numIterations, 
+                                                isSavingEachIteration=self.isSavingEachIteration, 
+                                                withTumor=withTumor,
+                                                alpha=self.alpha,
+                                                max_saves=self.maxSaves,
+                                                )
+            else:
+                self.reconLaser, self.indices = LS(SMatrix=self.SMatrix,
+                                                y=self.experiment.AOsignal_withoutTumor, 
                                                 numIterations=self.numIterations, 
                                                 isSavingEachIteration=self.isSavingEachIteration, 
                                                 withTumor=withTumor,

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/AOT_biomaps/AOT_Recon/BayesianRecon.py

@@ -66,6 +66,8 @@ class BayesianRecon(AlgebraicRecon):
             dir_name += f'_Beta_{self.beta}_Sigma_{self.sigma}'
 
         results_dir = os.path.join(self.saveDir, dir_name)
+        if not os.path.exists(results_dir):
+            os.makedirs(results_dir)
 
         if os.path.exists(os.path.join(results_dir,"reconIndices.npy")):
             return (True, results_dir)

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/AOT_biomaps/AOT_Recon/PrimalDualRecon.py

@@ -148,12 +148,6 @@ class PrimalDualRecon(AlgebraicRecon):
 
 
     def _convexReconPython(self, withTumor):
-        if withTumor:
-            y=self.experiment.AOsignal_withTumor
-
-        else:
-            y=self.experiment.AOsignal_withoutTumor
-
         if self.optimizer == OptimizerType.CP_TV:
             if withTumor:
                 self.reconPhantom, self.indices = CP_TV(

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/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.218'
+__version__ = '2.9.220'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -252,6 +252,8 @@ def initialize(process=None):
 
 
 
+
+
 
 
 

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/AOT_biomaps.egg-info/PKG-INFO

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

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/PKG-INFO

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

{aot_biomaps-2.9.218 → aot_biomaps-2.9.220}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='AOT_biomaps',
-    version='2.9.218',
+    version='2.9.220',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
@@ -227,6 +227,8 @@ setup(
 
 
 
+
+