Rename source_detection to source_catalog (#513)

changes/513.feature.rst

@@ -0,0 +1 @@
+Rename source_detection to source_catalog to match step name in romancal.

docs/schemas.rst

@@ -33,7 +33,7 @@ Level 4 (ancillary) schemas
 
 .. asdf-autoschemas::
 
-  source_catalog-1.0.0
+  image_source_catalog-1.0.0
   segmentation_map-1.0.0
   mosaic_source_catalog-1.0.0
   mosaic_segmentation_map-1.0.0
@@ -75,7 +75,7 @@ Tags
     resample-1.0.0
     sky_background-1.0.0
     statistics-1.0.0
-    source_detection-1.0.0
+    source_catalog-1.0.0
     velocity_aberration-1.0.0
     visit-1.0.0
     wcsinfo-1.0.0

src/rad/resources/manifests/datamodels-1.0.yaml

@@ -75,8 +75,8 @@ tags:
   title: Photometry information
   description: |-
     Photometry information
-- tag_uri: asdf://stsci.edu/datamodels/roman/tags/source_detection-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/source_detection-1.0.0
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/source_catalog-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0
   title: Source catalog for TweakReg
   description: |-
     Source catalog for TweakReg
@@ -262,9 +262,9 @@ tags:
   title: Calibration reference file names.
   description: |-
     Calibration reference file names.
-- tag_uri: asdf://stsci.edu/datamodels/roman/tags/source_catalog-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0
-  title: Source catalog
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/image_source_catalog-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-1.0.0
+  title: Image source catalog
   description: |-
     Photometry and astrometry computed by the Source Catalog Step
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/segmentation_map-1.0.0

src/rad/resources/schemas/image_source_catalog-1.0.0.yaml

@@ -0,0 +1,42 @@
+%YAML 1.1
+---
+$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
+id: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-1.0.0
+
+title: Source catalog generated from a Level 2 file by the Source Catalog Step.
+
+datamodel_name: ImageSourceCatalogModel
+
+archive_meta: None
+type: object
+properties:
+  meta:
+    allOf:
+      - $ref: basic-1.0.0
+      - type: object
+        properties:
+          optical_element:
+            $ref: wfi_optical_element-1.0.0
+          exposure:
+            title: Exposure Information
+            tag: asdf://stsci.edu/datamodels/roman/tags/exposure-1.0.0
+          photometry:
+            title: Photometry Information
+            tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0
+          program:
+            title: Program Information
+            tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0
+          visit:
+            title: Visit Information
+            tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0
+        required: [optical_element, exposure, photometry, program, visit]
+  source_catalog:
+    title: Source Catalog
+    description: |
+       Photometry and astrometry computed in the Source Catalog Step.
+    tag: tag:astropy.org:astropy/table/table-1.*
+
+required: [meta, source_catalog]
+flowStyle: block
+propertyOrder: [meta, source_catalog]
+...

src/rad/resources/schemas/individual_image_meta-1.0.0.yaml

@@ -71,9 +71,9 @@ properties:
     description: |
       Table of ref_file level 2 metadata.
     tag: tag:astropy.org:astropy/table/table-1.*
-  source_detection:
+  source_catalog:
     description: |
-      Table of source_detection level 2 metadata.
+      Table of source_catalog level 2 metadata.
     tag: tag:astropy.org:astropy/table/table-1.*
   velocity_aberration:
     description: |
@@ -90,6 +90,6 @@ properties:
 flowStyle: block
 propertyOrder: [basic, background, cal_step, cal_logs, coordinates, ephemeris,
   exposure, guide_star, instrument, observation, outlier_detection, photometry,
-  pointing, program, rcs, ref_file, source_detection, velocity_aberration,
+  pointing, program, rcs, ref_file, source_catalog, velocity_aberration,
   visit, wcsinfo]
 ...

src/rad/resources/schemas/l2_cal_step-1.0.0.yaml

@@ -86,8 +86,8 @@ properties:
     archive_catalog:
       datatype: nvarchar(15)
       destination: [ScienceRefData.s_photom]
-  source_detection:
-    title: Source Detection Step
+  source_catalog:
+    title: Source Catalog Step
     description: |
       Step in romancal that detects point sources in an
       image for use in astrometric alignment.
@@ -96,7 +96,7 @@ properties:
     maxLength: 15
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_source_detection]
+      destination: [ScienceRefData.s_source_catalog]
   ramp_fit:
     title: Ramp Fitting Step
     description: |
@@ -166,9 +166,9 @@ properties:
       datatype: nvarchar(15)
       destination: [ScienceRefData.s_skymatch]
 propertyOrder: [dq_init, saturation, refpix, linearity, dark, ramp_fit, assign_wcs,
-  flat_field, photom, source_detection, tweakreg, flux, skymatch, outlier_detection]
+  flat_field, photom, source_catalog, tweakreg, flux, skymatch, outlier_detection]
 flowStyle: block
 required: [assign_wcs, dark, dq_init, flat_field, flux, linearity, outlier_detection, photom,
-           source_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
+           source_catalog, ramp_fit, refpix, saturation, skymatch, tweakreg]
 additionalProperties: true
 ...

src/rad/resources/schemas/source_catalog-1.0.0.yaml

@@ -3,43 +3,13 @@
 $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
 id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0
 
-title: Source catalog generated from a Level 2 file by the Source Catalog Step.
-
-datamodel_name: SourceCatalogModel
-
-archive_meta: None
+title: Source Detection Catalog
 type: object
 properties:
-  meta:
-    allOf:
-      - $ref: basic-1.0.0
-      - type: object
-        properties:
-          optical_element:
-            title: WFI Optical Element
-            description: |
-              WFI optical element used to take the data.
-            $ref: wfi_optical_element-1.0.0
-          exposure:
-            title: Exposure Information
-            tag: asdf://stsci.edu/datamodels/roman/tags/exposure-1.0.0
-          photometry:
-            title: Photometry Information
-            tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0
-          program:
-            title: Program Information
-            tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0
-          visit:
-            title: Visit Information
-            tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0
-        required: [optical_element, exposure, photometry, program, visit]
-  source_catalog:
-    title: Source Catalog
+  tweakreg_catalog_name:
+    title: TweakReg Catalog Name
     description: |
-       Photometry and astrometry computed in the Source Catalog Step.
-    tag: tag:astropy.org:astropy/table/table-1.*
-
-required: [meta, source_catalog]
+      Source catalog generated by the source catalog step for TweakReg.
+    type: string
 flowStyle: block
-propertyOrder: [meta, source_catalog]
 ...

src/rad/resources/schemas/wfi_image-1.0.0.yaml

@@ -25,8 +25,8 @@ properties:
             tag: asdf://stsci.edu/datamodels/roman/tags/outlier_detection-1.0.0
           photometry:
             tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0
-          source_detection:
-            tag: asdf://stsci.edu/datamodels/roman/tags/source_detection-1.0.0
+          source_catalog:
+            tag: asdf://stsci.edu/datamodels/roman/tags/source_catalog-1.0.0
           statistics:
             tag: asdf://stsci.edu/datamodels/roman/tags/statistics-1.0.0
           wcs: