From baaa2a50715e813c268f840dcc848b6dd1a69805 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 20 Nov 2024 14:51:25 -0500 Subject: [PATCH 1/6] rename source_catalog to image_source_catalog --- docs/schemas.rst | 2 +- src/rad/resources/manifests/datamodels-1.0.yaml | 6 +++--- ...e_catalog-1.0.0.yaml => image_source_catalog-1.0.0.yaml} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/rad/resources/schemas/{source_catalog-1.0.0.yaml => image_source_catalog-1.0.0.yaml} (92%) diff --git a/docs/schemas.rst b/docs/schemas.rst index fe94793d..2f0b05af 100644 --- a/docs/schemas.rst +++ b/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 diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index e3d196a7..d2c59b20 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -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 diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/image_source_catalog-1.0.0.yaml similarity index 92% rename from src/rad/resources/schemas/source_catalog-1.0.0.yaml rename to src/rad/resources/schemas/image_source_catalog-1.0.0.yaml index 0bbbb471..21c7f2fb 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/image_source_catalog-1.0.0.yaml @@ -1,11 +1,11 @@ %YAML 1.1 --- $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-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: SourceCatalogModel +datamodel_name: ImageSourceCatalogModel archive_meta: None type: object From 0236368f33b85c08666a42ceda20dc3d5cca981a Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 20 Nov 2024 17:24:15 -0500 Subject: [PATCH 2/6] rename source_detection to source_catalog --- src/rad/resources/manifests/datamodels-1.0.yaml | 4 ++-- .../resources/schemas/individual_image_meta-1.0.0.yaml | 6 +++--- src/rad/resources/schemas/l2_cal_step-1.0.0.yaml | 8 ++++---- ...rce_detection-1.0.0.yaml => source_catalog-1.0.0.yaml} | 4 ++-- src/rad/resources/schemas/wfi_image-1.0.0.yaml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/rad/resources/schemas/{source_detection-1.0.0.yaml => source_catalog-1.0.0.yaml} (64%) diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index d2c59b20..7929747f 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/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 diff --git a/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml index 6fb7db66..71fb8882 100644 --- a/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml +++ b/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] ... diff --git a/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml b/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml index 83063202..e2f4a5b8 100644 --- a/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml +++ b/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. @@ -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 ... diff --git a/src/rad/resources/schemas/source_detection-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml similarity index 64% rename from src/rad/resources/schemas/source_detection-1.0.0.yaml rename to src/rad/resources/schemas/source_catalog-1.0.0.yaml index 102fa4d6..80a68850 100644 --- a/src/rad/resources/schemas/source_detection-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/source_detection-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0 title: Source Detection Catalog type: object @@ -9,7 +9,7 @@ properties: tweakreg_catalog_name: title: TweakReg Catalog Name description: | - Source catalog generated by the source detection step for TweakReg. + Source catalog generated by the source catalog step for TweakReg. type: string flowStyle: block ... diff --git a/src/rad/resources/schemas/wfi_image-1.0.0.yaml b/src/rad/resources/schemas/wfi_image-1.0.0.yaml index f631c13e..f40d06e7 100644 --- a/src/rad/resources/schemas/wfi_image-1.0.0.yaml +++ b/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: From 6e795975ad1b0b465b528bd04c1137382e6da766 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 20 Nov 2024 17:40:42 -0500 Subject: [PATCH 3/6] remove source_detection from docs --- docs/schemas.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas.rst b/docs/schemas.rst index 2f0b05af..2c8cbf36 100644 --- a/docs/schemas.rst +++ b/docs/schemas.rst @@ -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 From 8bc9fdec1b196164ce992e83b8793d402e49df14 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 2 Dec 2024 09:09:02 -0500 Subject: [PATCH 4/6] add changelog --- changes/513.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/513.feature.rst diff --git a/changes/513.feature.rst b/changes/513.feature.rst new file mode 100644 index 00000000..bf0cacb5 --- /dev/null +++ b/changes/513.feature.rst @@ -0,0 +1 @@ +Rename source_detection to source_catalog to match step name in romancal. From 00c6b4b685637d3b89cd4be4adf992e370009161 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 2 Dec 2024 15:45:48 -0500 Subject: [PATCH 5/6] remove ambiguous title and description --- src/rad/resources/schemas/image_source_catalog-1.0.0.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/rad/resources/schemas/image_source_catalog-1.0.0.yaml b/src/rad/resources/schemas/image_source_catalog-1.0.0.yaml index 21c7f2fb..73d42fb5 100644 --- a/src/rad/resources/schemas/image_source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/image_source_catalog-1.0.0.yaml @@ -16,9 +16,6 @@ properties: - 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 From a60eed1608e3fdf013f0001f4e345318cc7eb917 Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 3 Dec 2024 11:21:56 -0500 Subject: [PATCH 6/6] update archive_catalog destination for source_catalog cal_step --- src/rad/resources/schemas/l2_cal_step-1.0.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml b/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml index e2f4a5b8..a6cc8f77 100644 --- a/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml +++ b/src/rad/resources/schemas/l2_cal_step-1.0.0.yaml @@ -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: |