rerebase

winter-telescope · Dec 6, 2024 · 353c8ff · 353c8ff
1 parent 1f49b82
commit 353c8ff
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/mirar/pipelines/wasp/blocks.py b/mirar/pipelines/wasp/blocks.py
@@ -14,6 +14,7 @@
     sextractor_astrometry_config,
     sextractor_photometry_config,
     swarp_config_path,
+    wasp_cal_requirements,
 )
 from mirar.pipelines.wasp.config.constants import WASP_PIXEL_SCALE
 from mirar.pipelines.wasp.generator import (
@@ -52,15 +53,9 @@
     ImageSaver,
     ImageSelector,
 )
-from mirar.processors.utils.cal_hunter import CalHunter, CalRequirement
+from mirar.processors.utils.cal_hunter import CalHunter
 from mirar.processors.zogy.zogy import ZOGY, ZOGYPrepare
 
-WASP_CALS = [
-    CalRequirement(
-        target_name="bias", required_field="EXPTIME", required_values=["0.0"]
-    ),
-]
-
 load_raw = [
     ImageLoader(input_sub_dir="raw", load_image=load_raw_wasp_image),
     CustomImageBatchModifier(label_stack_id),
@@ -88,7 +83,7 @@
 
 calibrate = [
     ImageDebatcher(),
-    CalHunter(load_image=load_raw_wasp_image, requirements=WASP_CALS),
+    CalHunter(load_image=load_raw_wasp_image, requirements=wasp_cal_requirements),
     ImageSelector((OBSCLASS_KEY, ["bias", "flat", "science"])),
     BiasCalibrator(),
     ImageSelector((OBSCLASS_KEY, ["flat", "science"])),

diff --git a/mirar/pipelines/wasp/config/__init__.py b/mirar/pipelines/wasp/config/__init__.py
@@ -7,6 +7,7 @@
 import os
 
 from mirar.pipelines.wasp.config.constants import PIPELINE_NAME
+from mirar.processors.utils.cal_hunter import CalRequirement
 
 wasp_dir = os.path.dirname(__file__)
 
@@ -31,3 +32,9 @@
 swarp_config_path = os.path.join(astromatic_config_dir, "config.swarp")
 
 psfex_sci_config_path = os.path.join(astromatic_config_dir, "photom_sci.psfex")
+
+wasp_cal_requirements = [
+    CalRequirement(
+        target_name="bias", required_field="EXPTIME", required_values=["0.0"]
+    ),
+]
diff --git a/mirar/pipelines/wasp/generator/__init__.py b/mirar/pipelines/wasp/generator/__init__.py
@@ -59,10 +59,11 @@ def wasp_photometric_catalog_generator(image: Image) -> BaseCatalog:
     :return: catalog at image position
     """
     filter_name = image["FILTER"].replace("'", "")
-    dec = image["OBJDEC"]
+
+    ra, dec = image["CRVAL1"], image["CRVAL2"]
 
     if filter_name in ["u", "U"]:
-        if in_sdss(image["OBJRA"], image["OBJDEC"]):
+        if in_sdss(ra, dec):
             return SDSS(
                 min_mag=10,
                 max_mag=WASP_PHOTOMETRIC_MAX_MAG,

diff --git a/mirar/pipelines/wasp/wasp_pipeline.py b/mirar/pipelines/wasp/wasp_pipeline.py
@@ -8,7 +8,7 @@
 from mirar.data import Image
 from mirar.pipelines.base_pipeline import Pipeline
 from mirar.pipelines.wasp.blocks import build_log, load_raw, reduce, subtract
-from mirar.pipelines.wasp.config import PIPELINE_NAME
+from mirar.pipelines.wasp.config import PIPELINE_NAME, wasp_cal_requirements
 from mirar.pipelines.wasp.load_wasp_image import load_raw_wasp_image
 
 logger = logging.getLogger(__name__)
@@ -28,6 +28,8 @@ class WASPPipeline(Pipeline):
         "reduce": load_raw + reduce,
     }
 
+    defalut_cal_requirements = wasp_cal_requirements
+
     @staticmethod
     def download_raw_images_for_night(night: str | int):
         """

diff --git a/mirar/processors/utils/cal_hunter.py b/mirar/processors/utils/cal_hunter.py
@@ -195,6 +195,8 @@ class CalHunter(ImageLoader):
     by searching previous nights of data
     """
 
+    max_n_cpu = 1
+
     base_key = "calhunt"
 
     def __init__(