Remove SourceDetection rename source_detection to source_catalog (#1533)

spacetelescope · Dec 3, 2024 · 573d961 · 573d961
2 parents 20b1fdf + 967c03f
commit 573d961
Show file tree

Hide file tree

Showing 26 changed files with 92 additions and 636 deletions.
diff --git a/changes/1533.source_catalog.rst b/changes/1533.source_catalog.rst
@@ -0,0 +1 @@
+Use meta.source_catalog and meta.cal_step.source_catalog in source_catalog step.
diff --git a/changes/1533.source_detection.rst b/changes/1533.source_detection.rst
@@ -0,0 +1 @@
+Remove SourceDetectionStep (use SourceCatalogStep).
diff --git a/docs/roman/package_index.rst b/docs/roman/package_index.rst
@@ -17,6 +17,5 @@
    resample/index.rst
    skymatch/index.rst
    source_catalog/index.rst
-   source_detection/index.rst
    stpipe/index.rst
    tweakreg/index.rst
diff --git a/docs/roman/pipeline_steps.rst b/docs/roman/pipeline_steps.rst
@@ -14,7 +14,6 @@ Pipeline Steps
    flatfield/index.rst
    photom/index.rst
    flux/index.rst
-   source_detection/index.rst
    tweakreg/index.rst
    skymatch/index.rst
    outlier_detection/index.rst

diff --git a/docs/roman/source_catalog/main.rst b/docs/roman/source_catalog/main.rst
@@ -65,7 +65,7 @@ PSF Fitting
 
 Star finding algorithms like `~photutils.detection.DAOStarFinder` provide
 approximate stellar centroids. More precise centroids may be inferred by
-fitting model PSFs to the observations. Setting the SourceDetectionStep's
+fitting model PSFs to the observations. Setting the SourceCatalogStep's
 option `fit_psf` to True will generate model Roman PSFs with
 `WebbPSF <https://webbpsf.readthedocs.io/en/latest/roman.html>`_, and fit
 those models to each of the sources detected by

diff --git a/docs/roman/source_detection/arguments.rst b/docs/roman/source_detection/arguments.rst
diff --git a/docs/roman/source_detection/description.rst b/docs/roman/source_detection/description.rst
diff --git a/docs/roman/source_detection/index.rst b/docs/roman/source_detection/index.rst
diff --git a/docs/roman/source_detection/psf.rst b/docs/roman/source_detection/psf.rst
diff --git a/docs/roman/tweakreg/README.rst b/docs/roman/tweakreg/README.rst
@@ -7,7 +7,7 @@ Description
 Overview
 --------
 This step uses the coordinates of point-like sources from an input catalog
-(i.e. the result from `SourceDetectionStep` saved in the
+(i.e. the result from `SourceCatalogStep` saved in the
 `meta.tweakreg_catalog` attribute) and compares them with the
 coordinates from a Gaia catalog to compute corrections to
 the WCS of the input images such that sky catalogs obtained from the image catalogs
@@ -68,7 +68,7 @@ attributes to the catalog file names provided in either in the ASN table or
 
 Alignment
 ---------
-The source catalog (either created by `SourceDetectionStep` or provided by the user)
+The source catalog (either created by `SourceCatalogStep` or provided by the user)
 gets cross-matched and fit to an astrometric reference catalog
 (set by ``TweakRegStep.abs_refcat``) and the results are stored in
 ``model.meta.wcs_fit_results``. The pipeline initially supports fitting to any

diff --git a/romancal/lib/suffix.py b/romancal/lib/suffix.py
@@ -54,7 +54,6 @@
     "jump",
     "rampfit",
     "saturation",
-    "sourcedetection",
     "dark_current",
     "darkcurrent",
     "outlier_detection",
@@ -91,8 +90,6 @@
     "linearitystep",
     "dark_current",
     "jump",
-    "sourcedetection",
-    "sourcedetectionstep",
     "tweakregstep",
     "outlierdetectionstep",
     "skymatchstep",

diff --git a/romancal/pipeline/exposure_pipeline.py b/romancal/pipeline/exposure_pipeline.py
@@ -39,7 +39,7 @@ class ExposurePipeline(RomanPipeline):
     ramps to produce a 2-D slope product. Included steps are:
     dq_init, saturation, linearity, dark current, jump detection, ramp_fit,
     assign_wcs, flatfield (only applied to WFI imaging data), photom,
-    and source_detection.
+    and source_catalog.
     """
 
     class_alias = "roman_elp"
@@ -142,7 +142,7 @@ def process(self, input):
                     "assign_wcs",
                     "flat_field",
                     "photom",
-                    "source_detection",
+                    "source_catalog",
                     "dark",
                     "refpix",
                     "linearity",
@@ -176,7 +176,7 @@ def process(self, input):
                 log.info("Tweakreg step is being SKIPPED")
                 result.meta.cal_step.flat_field = "SKIPPED"
                 result.meta.cal_step.photom = "SKIPPED"
-                result.meta.cal_step.source_detection = "SKIPPED"
+                result.meta.cal_step.source_catalog = "SKIPPED"
                 result.meta.cal_step.tweakreg = "SKIPPED"
 
             self.output_use_model = True
@@ -215,7 +215,7 @@ def create_fully_saturated_zeroed_image(self, input_model):
             "assign_wcs",
             "flat_field",
             "photom",
-            "source_detection",
+            "source_catalog",
             "tweakreg",
         ]:
             fully_saturated_model.meta.cal_step[step_str] = "SKIPPED"

diff --git a/romancal/regtest/test_multiband_catalog.py b/romancal/regtest/test_multiband_catalog.py
@@ -28,7 +28,7 @@ def test_multiband_catalog(rtdata_module):
     # filter in it, so this is more of an existence proof for the multiband
     # catalogs than a detailed test.  Using only a single catalog lets us
     # rely on the existing regtest files.
-    outputfn = "r0099101001001001001_r274dp63x31y81_prompt_cat.asdf"
+    outputfn = "r0099101001001001001_r274dp63x31y81_prompt_F158_mbcat_cat.asdf"
     rtdata.get_asn(f"WFI/image/{inputasnfn}")
     rtdata.output = outputfn
     rtdata.input = inputasnfn

diff --git a/romancal/regtest/test_wfi_grism_pipeline.py b/romancal/regtest/test_wfi_grism_pipeline.py
@@ -98,7 +98,7 @@ def test_output_matches_truth(output_filename, truth_filename, ignore_asdf_paths
         # skipped
         ("flat_field", "SKIPPED"),
         ("photom", "SKIPPED"),
-        ("source_detection", "SKIPPED"),
+        ("source_catalog", "SKIPPED"),
         ("tweakreg", "SKIPPED"),
     ),
 )

diff --git a/romancal/regtest/test_wfi_image_pipeline.py b/romancal/regtest/test_wfi_image_pipeline.py
@@ -299,6 +299,6 @@ def test_pipeline_suffix(rtdata, ignore_asdf_paths):
         assert model.meta.cal_step.assign_wcs == "COMPLETE"
         assert model.meta.cal_step.flat_field == "COMPLETE"
         assert model.meta.cal_step.photom == "COMPLETE"
-        assert model.meta.cal_step.source_detection == "COMPLETE"
+        assert model.meta.cal_step.source_catalog == "COMPLETE"
         assert model.meta.cal_step.tweakreg == "INCOMPLETE"
         assert model.meta.filename == output
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use meta.source_catalog and meta.cal_step.source_catalog in source_catalog step.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove SourceDetectionStep (use SourceCatalogStep).