Incorporated review suggestions about placement of parallel_computati…

…on and master_node flags
cositools · Dec 16, 2024 · cddaa24 · cddaa24
1 parent b99ff6a
commit cddaa24
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 460 deletions.
diff --git a/cosipy/image_deconvolution/RLparallelscript.py b/cosipy/image_deconvolution/RLparallelscript.py
@@ -7,7 +7,7 @@
 from histpy import Histogram
 
 from cosipy.response import FullDetectorResponse
-from cosipy.image_deconvolution import ImageDeconvolution, DataIFWithParallel, DataIF_COSI_DC2
+from cosipy.image_deconvolution import ImageDeconvolution, DataIF_Parallel, DataIF_COSI_DC2
 
 # Define MPI variables
 MASTER = 0                      # Indicates master process
@@ -17,14 +17,14 @@
 def main():
     '''
     Main script to create a parallel execution-compatible
-    dataset using DataIFWithParallel and call ImageDeconvolution
+    dataset using DataIF_Parallel and call ImageDeconvolution
     '''
 
     # Set up MPI
     comm = MPI.COMM_WORLD
 
     # Create dataset
-    dataset = DataIFWithParallel(name = '511keV',
+    dataset = DataIF_Parallel(name = '511keV',
                                  event_filename = '511keV_dc2_galactic_event.hdf5',
                                  bkg_filename = '511keV_dc2_galactic_bkg.hdf5',
                                  drm_filename = 'psr_gal_511_DC2.h5',

diff --git a/cosipy/image_deconvolution/RichardsonLucy.py b/cosipy/image_deconvolution/RichardsonLucy.py
@@ -40,7 +40,8 @@ class RichardsonLucy(DeconvolutionAlgorithmBase):
 
     """
 
-    def __init__(self, initial_model:Histogram, dataset:list, mask, parameter, comm=None):
+    def __init__(self, initial_model:Histogram, dataset:list, mask, parameter, 
+                 parallel:bool=False, MASTER:bool=False):
 
         DeconvolutionAlgorithmBase.__init__(self, initial_model, dataset, mask, parameter)
 
@@ -70,20 +71,16 @@ def __init__(self, initial_model:Histogram, dataset:list, mask, parameter, comm=
             else:
                 os.makedirs(self.save_results_directory)
 
-        if comm is None:
-            self.MASTER = True
-        elif comm.Get_rank() == 0:
-            self.MASTER = True
-        else:
-            self.MASTER = False
+        self.parallel = parallel
+        self.MASTER = MASTER
 
     def initialization(self):
         """
         initialization before performing image deconvolution
         """
 
         # Master
-        if self.MASTER:
+        if (not self.parallel) or (self.MASTER):
             # Clear results
             self.results.clear()
 
@@ -199,7 +196,7 @@ def post_processing(self):
         # update expectation_list
         self.expectation_list = self.calc_expectation_list(self.model, dict_bkg_norm = self.dict_bkg_norm)
         logger.debug("The expected count histograms were updated with the new model map.")
-        
+
         # update loglikelihood_list
         self.loglikelihood_list = self.calc_loglikelihood_list(self.expectation_list)
         logger.debug("The loglikelihood list was updated with the new expected count histograms.")
@@ -221,7 +218,7 @@ def register_result(self):
         """
 
         # Master
-        if self.MASTER:
+        if (not self.parallel) or (self.MASTER):
             this_result = {"iteration": self.iteration_count, 
                         "model": copy.deepcopy(self.model), 
                         "delta_model": copy.deepcopy(self.delta_model),
@@ -257,7 +254,7 @@ def finalization(self):
         """
 
         # Master
-        if self.MASTER:
+        if (not self.parallel) or (self.MASTER):
             if self.save_results == True:
                 logger.info('Saving results in {self.save_results_directory}')
 

diff --git a/cosipy/image_deconvolution/__init__.py b/cosipy/image_deconvolution/__init__.py
@@ -2,7 +2,7 @@
 
 from .image_deconvolution_data_interface_base import ImageDeconvolutionDataInterfaceBase
 from .dataIF_COSI_DC2 import DataIF_COSI_DC2
-from .dataIFWithParallelSupport import DataIFWithParallel
+from .dataIF_Parallel import DataIF_Parallel
 
 from .model_base import ModelBase
 from .allskyimage import AllSkyImageModel