Add monitor test

winter-telescope · Nov 19, 2022 · 81df277 · 81df277
1 parent a473cd3
commit 81df277
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/winterdrp/monitor/base_monitor.py b/winterdrp/monitor/base_monitor.py
@@ -269,7 +269,7 @@ def postprocess(self):
         if self.postprocess_configurations is not None:
 
             postprocess_config = [ImageLoader(
-                load_image=self.pipeline.load_raw_image,
+                load_image=self.pipeline.unpack_raw_image,
                 input_sub_dir=self.sub_dir,
                 input_img_dir=str(Path(self.raw_image_directory)).split(self.pipeline_name)[0]
             )]
@@ -292,6 +292,7 @@ def postprocess(self):
                     self.latest_csv_log = processor.get_output_path()
 
             _, errorstack = self.pipeline.reduce_images(
+                dataset=Dataset(ImageBatch()),
                 selected_configurations=protected_key,
                 catch_all_errors=True
             )
@@ -352,13 +353,14 @@ def process_load_queue(self, q):
 
                         is_science = img["OBSCLASS"] == "science"
 
-                        all_img = ImageBatch([img] + copy.deepcopy(self.cal_images))
+                        all_img = ImageBatch(img) + copy.deepcopy(self.cal_images)
 
                         if not is_science:
                             print(f"Skipping {event.src_path} (calibration image)")
                         else:
                             print(f"Reducing {event.src_path} (science image) on thread {threading.get_ident()}")
                             _, errorstack = self.pipeline.reduce_images(
+                                dataset=Dataset(all_img),
                                 selected_configurations=self.realtime_configurations,
                                 catch_all_errors=True
                             )

diff --git a/winterdrp/pipelines/base_pipeline.py b/winterdrp/pipelines/base_pipeline.py
@@ -71,6 +71,9 @@ def load_raw_image(self, path: str) -> Image:
         data, header = self._load_raw_image(path)
         return Image(data=data, header=header)
 
+    def unpack_raw_image(self, path: str) -> tuple[np.ndarray, astropy.io.fits.Header]:
+        return self._load_raw_image(path)
+
     @staticmethod
     def configure_processors(
             processors: list[BaseProcessor],

diff --git a/winterdrp/processors/utils/image_loader.py b/winterdrp/processors/utils/image_loader.py
@@ -25,7 +25,7 @@ def __init__(
             self,
             input_sub_dir: str = raw_img_sub_dir,
             input_img_dir: str = base_raw_dir,
-            load_image: Callable = open_fits,
+            load_image: Callable[[str], [np.ndarray, astropy.io.fits.Header]] = open_fits,
             *args,
             **kwargs
     ):

diff --git a/winterdrp/processors/utils/simulate_realtime.py b/winterdrp/processors/utils/simulate_realtime.py
@@ -43,14 +43,12 @@ def _apply_to_images(
 
             img_path = self.input_img_dir.joinpath(image_name)
 
-            logger.info(img_path)
-
             output_path = Path(get_output_dir(
                 dir_root=self.output_dir_name,
                 sub_dir=self.night_sub_dir,
                 output_dir=self.output_dir
             ))
-            logger.info(output_path)
+            logger.debug(f"Copying {img_path} to {output_path}")
 
             if not output_path.exists():
                 output_path.mkdir(parents=True)