vignet makers: can use last and all in additional input inage directo…

…ries

shapepipe/modules/vignetmaker_package/vignetmaker.py

@@ -7,6 +7,7 @@
 """
 
 import re
+import os
 
 import numpy as np
 from astropy.wcs import WCS
@@ -183,22 +184,22 @@ def _get_stamp(self, img_path, pos, rad):
 
         return vign
 
-    def _get_stamp_me(self, image_dir, image_pattern):
+    def _get_stamp_me(self, image_dirs, image_pattern):
         """Get Stamp Multi-Epoch.
 
         Get stamps for multi-epoch data.
 
         Parameters
         ----------
-        image_dir : str
-            Path to the directory where the images are
+        image_dirs : list
+            Path to directories to search for input images
         image_pattern : str
             Common part of the file names
 
         Returns
         -------
         dict
-            Directory containing object id and vignets for each epoch
+            Dictionary containing object id and vignets for each epoch
 
         """
         cat = file_io.FITSCatalogue(self._galcat_path, SEx_catalogue=True)
@@ -226,10 +227,19 @@ def _get_stamp_me(self, image_dir, image_pattern):
                 if ccd == -1:
                     continue
 
-                img_path = (
-                    image_dir + '/' + image_pattern + '-'
-                    + exp_name + '-' + str(ccd) + '.fits'
-                )
+                # Look for input image
+                found = False
+                image_name = f"{image_pattern}-{exp_name}-{ccd}.fits"
+                for image_dir in image_dirs:
+                    img_path = f"{image_dir}/{image_name}"
+                    if os.path.exists(img_path):
+                        found = True
+                        break
+                if not found:
+                    raise FileNotFoundError(
+                        f"Could not find image {image_name}"
+                    )
+
                 ind_obj = np.where(cat.get_data(hdu_index)['CCD_N'] == ccd)[0]
                 obj_id = all_id[ind_obj]
 
@@ -292,41 +302,39 @@ def _get_stamp_me(self, image_dir, image_pattern):
 
         return output_dict
 
-    def process_me(self, image_dir, image_pattern, f_wcs_path, rad):
+    def process_me(self, image_dirs, image_pattern, f_wcs_path, rad):
         """Process Multi-Epoch.
 
         Main function to create the stamps in the multi-epoch case.
 
         Parameters
         ----------
-        image_dir : list
-            List of directories where the image are; ff ``len(image_dir) == 1``
-            -> all images are in the same directory, else ``len(image_dir)``
-            must match ``len(image_pattern)``
+        image_dirs : list
+            Directories of image locations.
+            Each list item contains sublist in which images are searched.
+            Length of outer list has to match image_pattern, or be single item.
         image_pattern : list
             Common part of each kind of file names
         f_wcs_path : str
             Path to the log file containing the WCS for each CCDs
         rad : int
-            Radius of the stamp, must be odd
+            Radius of the stamp, must be an odd integer
 
         """
         self._f_wcs_file = SqliteDict(f_wcs_path)
         self._rad = rad
 
         for idx in range(len(image_pattern)):
 
-            if len(image_dir) != len(image_pattern):
-                output_dict = self._get_stamp_me(
-                    image_dir[0],
-                    image_pattern[idx],
-                )
-
+            if len(image_dirs) != len(image_pattern):
+                index = 0
             else:
-                output_dict = self._get_stamp_me(
-                    image_dir[idx],
-                    image_pattern[idx],
-                )
+                index = idx
+
+            output_dict = self._get_stamp_me(
+                image_dirs[index],
+                image_pattern[idx],
+            )
 
             self._save_vignet_me(output_dict, image_pattern[idx])
 

shapepipe/modules/vignetmaker_runner.py

@@ -2,14 +2,14 @@
 
 Module runner for ``vignetmaker``.
 
-:Author: Axel Guinot
+:Authors: Axel Guinot, Martin Kilbinger
 
 """
 
 from shapepipe.modules.module_decorator import module_runner
 from shapepipe.modules.vignetmaker_package import vignetmaker as vm
 
-from shapepipe.pipeline.run_log import get_last_dir
+from shapepipe.pipeline.run_log import get_last_dir, get_all_dirs
 
 
 @module_runner(
@@ -91,12 +91,19 @@ def vignetmaker_runner(
         elif mode == 'MULTI-EPOCH':
             # Fetch image directory and patterns
             modules = config.getlist(module_config_sec, 'ME_IMAGE_DIR')
-            image_dir = []
+            image_dirs = []
             for module in modules:
-                #last_dir = get_last_dir(run_dirs['run_log'], module)
-                all_dirs = get_all_dirs(run_dirs['run_log'], module)
-                for my_dir in all_dirs:
-                    image_dir.append(my_dir)
+                module_name = module.split(":")[-1]
+                if "last" in module:
+                    dirs = [get_last_dir(run_dirs['run_log'], module_name)]
+                elif "all" in module:
+                    dirs = get_all_dirs(run_dirs['run_log'], module_name)
+                else:
+                    raise ValueError(
+                        "Expected qualifier 'last:' or 'all' before module"
+                        + f" '{module}' in config entry 'ME_IMAGE_DIR'")
+                image_dirs.append(dirs)
+
             image_pattern = config.getlist(
                 module_config_sec,
                 'ME_IMAGE_PATTERN',
@@ -105,7 +112,7 @@ def vignetmaker_runner(
             f_wcs_path = config.getexpanded(module_config_sec, 'ME_LOG_WCS')
 
             # Process inputs
-            vm_inst.process_me(image_dir, image_pattern, f_wcs_path, radius)
+            vm_inst.process_me(image_dirs, image_pattern, f_wcs_path, radius)
 
         # Invalid mode
         else: