Merge branch 'main' into release/0.16.x

CHANGES.rst

@@ -1,3 +1,21 @@
+0.16.3 (2024-08-29)
+===================
+
+mosaic_pipeline
+---------------
+
+- Only load patch table when needed. [#1367]
+
+source_catalog
+--------------
+
+- Populate segmentation image metadata. [#1391]
+
+resample
+--------
+
+- Use association product name for output meta.filename by default [#1391]
+
 0.16.2 (2024-08-23)
 ===================
 

README.md

@@ -170,6 +170,7 @@ an [issue](https://github.com/spacetelescope/romancal/issues).
 | 0.16.0    | 24Q4_B15  | 063          | Aug 2024  | Release for Build 24Q3_B15 (Build 15) |
 | 0.16.1    | 24Q4_B15  | 063          | Aug 2024  | Release for Build 24Q3_B15 (Build 15) |
 | 0.16.2    | 24Q4_B15  | 063          | Aug 2024  | Release for Build 24Q3_B15 (Build 15) |
+| 0.16.3    | 24Q4_B15  | 063          | Aug 2024  | Release for Build 24Q3_B15 (Build 15) |
 
 
 Note: CRDS_CONTEXT values flagged with an asterisk in the above table are estimates

romancal/outlier_detection/outlier_detection_step.py

@@ -152,7 +152,7 @@ def process(self, input_models):
                     intermediate_files_suffixes = (
                         "*blot.asdf",
                         "*median.asdf",
-                        f'*{pars.get("resample_suffix")}*.asdf',
+                        f'*outlier_{pars.get("resample_suffix")}.asdf',
                     )
                     for current_path in intermediate_files_paths:
                         for suffix in intermediate_files_suffixes:

romancal/patch_match/patch_match.py

@@ -83,6 +83,8 @@ def find_patch_matches(image_corners, image_shape=None):
     necessary information about the patches.
     """
 
+    if PATCH_TABLE is None:
+        load_patch_table()
     if PATCH_TABLE is None:
         raise RuntimeError("No patch table has been loaded")
     if isinstance(image_corners, wcs.WCS):
@@ -250,6 +252,3 @@ def veccoords_to_tangent_plane(vertices, tangent_point_vec):
     x_coords = np.dot(x_axis, avertices) * RAD_TO_ARCSEC
     y_coords = np.dot(y_axis, avertices) * RAD_TO_ARCSEC
     return x_coords, y_coords
-
-
-load_patch_table()

romancal/pipeline/mosaic_pipeline.py

@@ -88,6 +88,10 @@ def process(self, input):
 
             # if this is a valid skycell name load the database and get the skycell record
             if re.match(r"r\d{3}\w{2}\d{2}x\d{2}y\d{2}", skycell_name):
+                if patch_match.PATCH_TABLE is None:
+                    patch_match.load_patch_table()
+                if patch_match.PATCH_TABLE is None:
+                    raise RuntimeError("No patch table has been loaded")
                 skycell_record = patch_match.PATCH_TABLE[
                     np.where(patch_match.PATCH_TABLE["name"][:] == skycell_name)[0][0]
                 ]
@@ -127,10 +131,9 @@ def process(self, input):
                         )
                         wcs_file = asdf.open(self.resample.output_wcs)
                         self.suffix = "i2d"
-                        result = self.resample(result)
                         self.output_file = input.asn["products"][0]["name"]
-                        # force the SourceCatalogStep to save the results
-                        self.sourcecatalog.save_results = True
+                        result = self.resample(result)
+                        self.sourcecatalog.output_file = self.output_file
                         result_catalog = self.sourcecatalog(result)
                     else:
                         log.info("resampling a mosaic file is not yet supported")
@@ -140,7 +143,7 @@ def process(self, input):
                 self.resample.suffix = "i2d"
                 self.output_file = input.asn["products"][0]["name"]
                 result = self.resample(result)
-                self.sourcecatalog.save_results = True
+                self.sourcecatalog.output_file = self.output_file
                 result_catalog = self.sourcecatalog(result)  # noqa: F841
                 self.suffix = "i2d"
                 if input_filename:

romancal/resample/resample_step.py

@@ -83,11 +83,14 @@ def process(self, input):
             output = input_models.asn["products"][0]["name"]
         elif isinstance(input, ModelLibrary):
             input_models = input
-            # set output filename using the common prefix of all datamodels
-            output = f"{os.path.commonprefix([x['expname'] for x in input_models.asn['products'][0]['members']])}.asdf"
-            if len(output) == 0:
-                # set default filename if no common prefix can be determined
-                output = "resample_output.asdf"
+            if "name" in input_models.asn["products"][0]:
+                output = input_models.asn["products"][0]["name"]
+            else:
+                # set output filename using the common prefix of all datamodels
+                output = f"{os.path.commonprefix([x['expname'] for x in input_models.asn['products'][0]['members']])}.asdf"
+                if len(output) == 0:
+                    # set default filename if no common prefix can be determined
+                    output = "resample_output.asdf"
         else:
             raise TypeError(
                 "Input must be an ASN filename, a ModelLibrary, "

romancal/source_catalog/source_catalog_step.py

@@ -145,10 +145,21 @@ def process(self, input_model):
 
     def save_base_results(self, segment_img, source_catalog_model):
         # save the segmentation map and
-        output_filename = source_catalog_model.meta.filename
-        segmentation_model = maker_utils.mk_datamodel(
-            datamodels.MosaicSegmentationMapModel
+        output_filename = (
+            self.output_file
+            if self.output_file is not None
+            else source_catalog_model.meta.filename
         )
+
+        if isinstance(source_catalog_model, datamodels.SourceCatalogModel):
+            seg_model = datamodels.SegmentationMapModel
+        else:
+            seg_model = datamodels.MosaicSegmentationMapModel
+
+        segmentation_model = maker_utils.mk_datamodel(seg_model)
+        for key in segmentation_model.meta.keys():
+            segmentation_model.meta[key] = source_catalog_model.meta[key]
+
         if segment_img is not None:
             segmentation_model.data = segment_img.data.astype(np.uint32)
             self.save_model(

romancal/source_catalog/tests/test_source_catalog.py

@@ -14,6 +14,7 @@
     MosaicModel,
     MosaicSegmentationMapModel,
     MosaicSourceCatalogModel,
+    SegmentationMapModel,
     SourceCatalogModel,
 )
 from roman_datamodels.maker_utils import mk_level2_image, mk_level3_mosaic
@@ -461,7 +462,7 @@ def test_do_psf_photometry_column_names(tmp_path, image_model, fit_psf):
             ImageModel,
             {
                 "cat": SourceCatalogModel,
-                "segm": MosaicSegmentationMapModel,
+                "segm": SegmentationMapModel,
                 "sourcecatalog": ImageModel,
             },
         ),
@@ -474,7 +475,7 @@ def test_do_psf_photometry_column_names(tmp_path, image_model, fit_psf):
             SourceCatalogModel,
             {
                 "cat": SourceCatalogModel,
-                "segm": MosaicSegmentationMapModel,
+                "segm": SegmentationMapModel,
             },
         ),
         (
@@ -486,7 +487,7 @@ def test_do_psf_photometry_column_names(tmp_path, image_model, fit_psf):
             ImageModel,
             {
                 "cat": SourceCatalogModel,
-                "segm": MosaicSegmentationMapModel,
+                "segm": SegmentationMapModel,
             },
         ),
         (
@@ -498,7 +499,7 @@ def test_do_psf_photometry_column_names(tmp_path, image_model, fit_psf):
             SourceCatalogModel,
             {
                 "cat": SourceCatalogModel,
-                "segm": MosaicSegmentationMapModel,
+                "segm": SegmentationMapModel,
             },
         ),
     ),