Copy L2/L3 model metadata to source catalog metadata

romancal/regtest/test_catalog.py

@@ -69,7 +69,6 @@ def test_catalog_l3(rtdata, ignore_asdf_paths):
     catalogfp = asdf.open(outputfn)
     catalog = catalogfp["roman"]["source_catalog"]
     step = SourceCatalogStep()
-    fields = catalog.dtype.names
     assert check_catalog_fields(catalog, step.log, "L3")
 
     # no compare_asdf on the catalogs
@@ -98,7 +97,6 @@ def test_catalog_l2(rtdata, ignore_asdf_paths):
     catalogfp = asdf.open(outputfn)
     catalog = catalogfp["roman"]["source_catalog"]
     step = SourceCatalogStep()
-    fields = catalog.dtype.names
 
     assert check_catalog_fields(catalog, step.log, "L2")
     # no compare_asdf on the catalogs

romancal/source_catalog/source_catalog_step.py

@@ -51,9 +51,21 @@ def process(self, input_model):
                     "The input model must be an ImageModel or MosaicModel."
                 )
 
-            source_catalog_model = maker_utils.mk_datamodel(
-                datamodels.MosaicSourceCatalogModel
-            )
+            if isinstance(model, ImageModel):
+                cat_model = datamodels.SourceCatalogModel
+            else:
+                cat_model = datamodels.MosaicSourceCatalogModel
+            source_catalog_model = maker_utils.mk_datamodel(cat_model)
+
+            for key in source_catalog_model.meta.keys():
+                try:
+                    if key == "optical_element":
+                        value = model.meta.instrument[key]
+                    else:
+                        value = model.meta[key]
+                    source_catalog_model.meta[key] = value
+                except KeyError:
+                    pass
 
             aperture_ee = (self.aperture_ee1, self.aperture_ee2, self.aperture_ee3)
             refdata = ReferenceData(model, aperture_ee)