Merge branch 'main' of https://github.com/spacetelescope/rad

.github/workflows/ci.yml

@@ -18,8 +18,7 @@ jobs:
     with:
       envs: |
         - linux: py310-xdist
-        - linux: py311-xdist
-        - macos: py311-xdist
         - linux: py311-xdist-cov
           coverage: codecov
         - linux: py312-xdist
+        - linux: py313-xdist

.pre-commit-config.yaml

@@ -34,13 +34,13 @@ repos:
         - tomli
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v3.17.0'
+  rev: 'v3.19.0'
   hooks:
     - id: pyupgrade
       args: ["--py38-plus"]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.6.9'
+  rev: 'v0.7.1'
   hooks:
     - id: ruff
       args: ["--fix"]

changes/466.misc.rst

@@ -0,0 +1 @@
+Updated ``cal_step`` and ``cal_log`` schema information.

changes/467.misc.rst

@@ -0,0 +1 @@
+Update ``coordinate`` schema descriptions

changes/468.feature.rst

@@ -0,0 +1 @@
+Add python 3.13 support.

changes/469.misc.rst

@@ -0,0 +1 @@
+Update ``ephemeris`` schema descriptions

changes/471.misc.rst

@@ -0,0 +1 @@
+Updates ``guide_star``, ``instrument``, and ``photometry`` schemas

changes/473.misc.rst

@@ -0,0 +1 @@
+Add ``rcs`` and removes ``aperture``, ``target`` schemas

changes/474.misc.rst

@@ -0,0 +1 @@
+Update and add keywords and descriptions in the basic-1.0.0 and statistics schemas

changes/475.misc.rst

@@ -0,0 +1 @@
+Update the pointing schema

changes/476.misc.rst

@@ -0,0 +1 @@
+Update velocity_aberration descriptions and keywords

changes/477.misc.rst

@@ -0,0 +1 @@
+Updates wcs keywords and attribute information

changes/478.misc.rst

@@ -0,0 +1 @@
+Update exposure and program attributes information

changes/479.misc.rst

@@ -0,0 +1 @@
+Update ref_file descriptions

changes/480.misc.rst

@@ -0,0 +1 @@
+Update observation descriptions

changes/481.misc.rst

@@ -0,0 +1 @@
+Update visit, l1, and l2 attribute information

changes/487.misc.rst

@@ -0,0 +1,2 @@
+Update and add descriptions in the individual image metadata schema.
+Address merge issues created by the L1 and L2 metadata updates.

docs/schemas.rst

@@ -44,7 +44,6 @@ Tags
 
 .. asdf-autoschemas::
 
-    aperture-1.0.0
     associations-1.0.0
     basic-1.0.0
     cal_logs-1.0.0
@@ -73,7 +72,6 @@ Tags
     ref_file-1.0.0
     resample-1.0.0
     source_detection-1.0.0
-    target-1.0.0
     velocity_aberration-1.0.0
     visit-1.0.0
     wcsinfo-1.0.0
@@ -85,6 +83,5 @@ Tags
     tagged_scalars/filename-1.0.0
     tagged_scalars/model_type-1.0.0
     tagged_scalars/origin-1.0.0
-    tagged_scalars/prd_software_version-1.0.0
     tagged_scalars/sdf_software_version-1.0.0
     tagged_scalars/telescope-1.0.0

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

@@ -85,21 +85,21 @@ tags:
   title: Coordinate frame information
   description: |-
     Coordinate frame information
-- tag_uri: asdf://stsci.edu/datamodels/roman/tags/aperture-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/aperture-1.0.0
-  title: Aperture information
-  description: |-
-    Aperture information
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/pointing-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/pointing-1.0.0
   title: Spacecraft Pointing information
   description: |-
     Spacecraft Pointing information
-- tag_uri: asdf://stsci.edu/datamodels/roman/tags/target-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/target-1.0.0
-  title: Target information
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/rcs-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/rcs-1.0.0
+  title: Relative Calibration System Information
+  description: |-
+    Relative Calibration System Information
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/statistics-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/statistics-1.0.0
+  title: Basic Statistical Information
   description: |-
-    Target information
+    Basic Statistical Information
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/velocity_aberration-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/velocity_aberration-1.0.0
   title: Velocity aberration information
@@ -283,46 +283,66 @@ tags:
   description: |-
     Segmentation map computed by the Source Catalog Step
 # Tagged Scalars
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/calibration_software_name-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/calibration_software_name-1.0.0
+  title: Calibration Software Name
+  description: |-
+    Name of the calibration software package used in
+    processing this file.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/calibration_software_version-1.0.0
   title: Calibration software version
   description: |-
-    Calibration software version number
+    The version number of the calibration software used in
+    processing this file.
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/product_type-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/product_type-1.0.0
+  title: Product Type Descriptor
+  description: |-
+    A descriptor for the type of data contained within the
+    file. This corresponds to the standard file suffixes for
+    archival data products. Consult the documentation for the list
+    of options.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/filename-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/filename-1.0.0
-  title: Name of the file
+  title: File Name
   description: |-
-    Name of the file
+    The auto-generated name of this file.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/file_date-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/file_date-1.0.0
-  title: Date this file was created (UTC)
+  title: File Creation Date
   description: |-
-    Date this file was created (UTC)
+    The date and time this file was created.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/model_type-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/model_type-1.0.0
-  title: Type of data model
+  title: Data Model Type
   description: |-
-    Type of data model
+    The type of data model contained within this file.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/origin-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/origin-1.0.0
-  title: Organization responsible for creating file
+  title: Institution / Organization Name
   description: |-
-    Organization responsible for creating file
-- tag_uri: asdf://stsci.edu/datamodels/roman/tags/prd_software_version-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/prd_software_version-1.0.0
-  title: S&OC PRD version number used in data processing
+    The name of the institution of organization
+    responsible for creating this file.
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/prd_version-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/prd_version-1.0.0
+  title: SOC PRD Version Number
   description: |-
-    S&OC PRD version number used in data processing
+    The version number of the Science Operations Center
+    (SOC) Project Reference Database (PRD) used in generating this
+    file.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/sdf_software_version-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/sdf_software_version-1.0.0
-  title: SDF software version number
+  title: SOC SDF Version Number
   description: |-
-    SDF software version number
+    The version number of the Science Operations Center
+    (SOC) Science Data Formatting (SDF) software used in generating
+    this file.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/telescope-1.0.0
-  title: Telescope used to acquire the data
+  title: Telescope Name
   description: |-
-    Telescope used to acquire the data
+    The name of the telescope used to acquire the data.
 # FPS Schemas
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/fps-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/fps-1.0.0

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

@@ -8,12 +8,26 @@ title: Basic Information
 type: object
 properties:
   # Meta Variables
+  calibration_software_name:
+    title: Calibration Software Name
+    description: |
+      Name of the calibration software package used in
+      processing this file.
+    tag: asdf://stsci.edu/datamodels/roman/tags/calibration_software_name-1.0.0
   calibration_software_version:
     title: Calibration Software Version Number
     description: |
       The version number of the calibration software used in processing this
       file.
     tag: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0
+  product_type:
+    title: Product Type Descriptor
+    description: |
+      A descriptor for the type of data contained within the
+      file. This corresponds to the standard file suffixes for
+      archival data products. Consult the documentation for the list
+      of options.
+    tag: asdf://stsci.edu/datamodels/roman/tags/product_type-1.0.0
   filename:
     title: File Name
     description: |
@@ -27,32 +41,34 @@ properties:
   model_type:
     title: Data Model Type
     description: |
-      The type of data model contained in this file.
+      The type of data model contained within this file.
     tag: asdf://stsci.edu/datamodels/roman/tags/model_type-1.0.0
   origin:
     title: Institution / Organization Name
     description: |
-      The name of the institution or organization responsible for creating this
-      file.
+      The name of the institution or organization
+      responsible for creating this file.
     tag: asdf://stsci.edu/datamodels/roman/tags/origin-1.0.0
-  prd_software_version:
+  prd_version:
     title: SOC PRD Version Number
     description: |
-      The Science Operations Center (SOC) Project Reference Database (PRD)
-      version number used in generating this file.
-    tag: asdf://stsci.edu/datamodels/roman/tags/prd_software_version-1.0.0
+      The version number of the Science Operations Center
+      (SOC) Project Reference Database (PRD) used in generating this
+      file.
+    tag: asdf://stsci.edu/datamodels/roman/tags/prd_version-1.0.0
   sdf_software_version:
-    title: SDF Version Number
+    title: SOC SDF Version Number
     description: |
-      The version number of the Science Data Formatting (SDF) software used in
-      generating this file.
+      The version number of the Science Operations Center
+      (SOC) Science Data Formatting (SDF) software used in generating
+      this file.
     tag: asdf://stsci.edu/datamodels/roman/tags/sdf_software_version-1.0.0
   telescope:
     title: Telescope Name
     description: |
       The name of the telescope used to acquire the data.
     tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0
-required: [calibration_software_version, filename, file_date,
-           model_type, origin, prd_software_version,
-           sdf_software_version, telescope]
+required: [calibration_software_name, calibration_software_version,
+  filename, file_date, model_type, origin, prd_version,
+  sdf_software_version, telescope]
 ...

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

@@ -5,8 +5,8 @@ id: asdf://stsci.edu/datamodels/roman/schemas/cal_logs-1.0.0
 
 title: Calibration Log Messages
 description: |
-  String array of log messages recording the steps, failures, and outputs
-  associated with running the romancal.ramp_fitting.ramp_fit_step.
+  String array of log messages recording the steps, failures,
+  and outputs associated with running romancal steps.
 type: array
 items:
   type: string

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

@@ -11,12 +11,6 @@ allOf:
 - type: object
   properties:
     # Meta Objects
-    aperture:
-      title: Aperture Information
-      tag: asdf://stsci.edu/datamodels/roman/tags/aperture-1.0.0
-    cal_step:
-      title: Tracker of Calibration Pipeline Steps
-      tag: asdf://stsci.edu/datamodels/roman/tags/l2_cal_step-1.0.0
     coordinates:
       title: Name Of The Coordinate Reference Frame
       tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0
@@ -26,7 +20,7 @@ allOf:
     exposure:
       title: Exposure Information
       tag: asdf://stsci.edu/datamodels/roman/tags/exposure-1.0.0
-    guidestar:
+    guide_star:
       title: Guide Star Window Information
       tag: asdf://stsci.edu/datamodels/roman/tags/guidestar-1.0.0
     instrument:
@@ -44,9 +38,9 @@ allOf:
     ref_file:
       title: Reference File Information
       tag: asdf://stsci.edu/datamodels/roman/tags/ref_file-1.0.0
-    target:
-      title: Target Information
-      tag: asdf://stsci.edu/datamodels/roman/tags/target-1.0.0
+    rcs:
+      title: Relative Calibration System Information
+      tag: asdf://stsci.edu/datamodels/roman/tags/rcs-1.0.0
     velocity_aberration:
       title: Velocity Aberration Correction Information
       tag: asdf://stsci.edu/datamodels/roman/tags/velocity_aberration-1.0.0
@@ -56,7 +50,7 @@ allOf:
     wcsinfo:
       title: World Coordinate System (WCS) Parameters
       tag: asdf://stsci.edu/datamodels/roman/tags/wcsinfo-1.0.0
-  required: [aperture, cal_step, coordinates, ephemeris, exposure, guidestar,
+  required: [coordinates, ephemeris, exposure, guide_star,
              instrument, observation, pointing, program, ref_file,
-             target, velocity_aberration, visit, wcsinfo]
+             rcs, velocity_aberration, visit, wcsinfo]
 ...

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

@@ -7,9 +7,10 @@ title: Name Of The Coordinate Reference Frame
 type: object
 properties:
   reference_frame:
-    title: Name of the Coordinate Reference Frame
+    title: Name of the Celestial Coordinate Reference Frame
     description: |
-      Name of the coordinate reference frame.
+      Name of the celestial coordinate reference frame used
+      for the World Coordinate System (WCS).
     type: string
     default: ICRS
     enum: [ICRS]