Skip to content

Commit

Permalink
switch tag keywords for external tags to wildcards (spacetelescope#370)
Browse files Browse the repository at this point in the history
* switch tag keywords for external tags to wildcards

* add changelog

* fix changelog following release
  • Loading branch information
braingram authored Feb 9, 2024
1 parent 1f40287 commit e85f964
Show file tree
Hide file tree
Showing 28 changed files with 226 additions and 227 deletions.
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
0.19.1 (unreleased)
-------------------

-
- Convert tag keywords to wildcards for external tags. [#370]


0.19.0 (2024-02-09)
-------------------
Expand All @@ -12,6 +13,7 @@

- Add wcs tag to wfi_image and wfi_mosaic schemas. [#351]


0.18.0 (2023-11-06)
-------------------

Expand Down
6 changes: 3 additions & 3 deletions src/rad/resources/schemas/exposure-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ properties:
description: |
This is a python date-time object that records the
time at the start of the exposure in UTC.
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand All @@ -49,7 +49,7 @@ properties:
description: |
This is a python date-time object that records the
time at the middle of the exposure in UTC.
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand All @@ -62,7 +62,7 @@ properties:
description: |
This is a python date-time object that records the
time at the end of the exposure in UTC.
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand Down
26 changes: 13 additions & 13 deletions src/rad/resources/schemas/guidewindow-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ properties:
properties:
gw_start_time:
title: UTC time at the start of the guide window exposure
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand All @@ -28,7 +28,7 @@ properties:
destination: [GuideWindow.gw_start_time]
gw_end_time:
title: UTC time at the end of the guide window exposure
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand All @@ -48,7 +48,7 @@ properties:
destination: [GuideWindow.gw_frame_readout_time]
gw_function_start_time:
title: Observatory UTC time at guider function start
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand All @@ -58,7 +58,7 @@ properties:
destination: [GuideWindow.gw_function_start_time]
gw_function_end_time:
title: Observatory UTC time at guider function end
tag: tag:stsci.edu:asdf/time/time-1.1.0
tag: tag:stsci.edu:asdf/time/time-1.*
sdf:
special_processing: VALUE_REQUIRED
source:
Expand Down Expand Up @@ -208,40 +208,40 @@ properties:
title: "Reconstituted and oriented pedestal frame GW images.
Dimensions: num_frames, num_combined_resultants
(or num_uncombined_resultants), num_reads, x, y"
tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: uint16
ndim: 5
unit:
tag: tag:astropy.org:astropy/units/unit-1.0.0
tag: tag:astropy.org:astropy/units/unit-1.*
enum: ["DN"]
signal_frames:
title: "Reconstituted and oriented signal frames. Dimensions: num_frames,
num_combined_resultants (or num_uncombined_resultants),
num_reads, x, y"
tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: uint16
ndim: 5
unit:
tag: tag:astropy.org:astropy/units/unit-1.0.0
tag: tag:astropy.org:astropy/units/unit-1.*
enum: ["DN"]
amp33:
title: "Amp 33 reference pixel data. Dimensions: num_frames,
num_combined_resultants (or num_uncombined_resultants),
num_reads, x, y"
tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: uint16
ndim: 5
unit:
tag: tag:astropy.org:astropy/units/unit-1.0.0
tag: tag:astropy.org:astropy/units/unit-1.*
enum: ["DN"]
propertyOrder: [meta, pedestal_frames, signal_frames, amp33]
flowStyle: block
Expand Down
34 changes: 17 additions & 17 deletions src/rad/resources/schemas/individual_image_meta-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,71 +10,71 @@ properties:
basic:
description: |
Table of basic level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
aperture:
description: |
Table of aperture level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
cal_step:
description: |
Table of cal_step level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
coordinates:
description: |
Table of coordinates level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
ephemeris:
description: |
Table of ephemeris level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
exposure:
description: |
Table of exposure level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
guidestar:
description: |
Table of guidestar level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
instrument:
description: |
Table of instrument level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
observation:
description: |
Table of observation level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
photometry:
description: |
Table of photometry level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
pointing:
description: |
Table of pointing level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
program:
description: |
Table of program level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
ref_file:
description: |
Table of ref_file level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
target:
description: |
Table of target level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
velocity_aberration:
description: |
Table of velocity_aberration level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
visit:
description: |
Table of visit level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
wcsinfo:
description: |
Table of wcsinfo level 2 metadata.
tag: tag:astropy.org:astropy/table/table-1.1.0
tag: tag:astropy.org:astropy/table/table-1.*
flowStyle: block
propertyOrder: [basic, aperture, cal_step, coordinates, ephemeris,
exposure, guidestar, instrument, observation, photometry,
Expand Down
8 changes: 4 additions & 4 deletions src/rad/resources/schemas/msos_stack-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ properties:
data:
title: Flux data
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: float64
ndim: 2
uncertainty:
title: uncertainty data
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: float64
ndim: 2
mask:
title: mask data
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: uint8
ndim: 2
coverage:
title: coverage data
value:
tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
tag: tag:stsci.edu:asdf/core/ndarray-1.*
datatype: uint8
ndim: 2
propertyOrder: [meta, data, uncertainty, mask, coverage]
Expand Down
24 changes: 12 additions & 12 deletions src/rad/resources/schemas/photometry-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ properties:
conversion_megajanskys:
title: Flux density (MJy/steradian) producing 1 cps
anyOf:
- tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
- tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
datatype:
enum: ["float64"]
unit:
tag: tag:stsci.edu:asdf/unit/unit-1.0.0
tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["MJy.sr**-1"]
- type: "null"
archive_catalog:
Expand All @@ -23,12 +23,12 @@ properties:
conversion_microjanskys:
title: Flux density (uJy/arcsec2) producing 1 cps
anyOf:
- tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
- tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
datatype:
enum: ["float64"]
unit:
tag: tag:stsci.edu:asdf/unit/unit-1.0.0
tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["uJy.arcsec**-2"]
- type: "null"
archive_catalog:
Expand All @@ -37,12 +37,12 @@ properties:
pixelarea_steradians:
title: Nominal pixel area in steradians
anyOf:
- tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
- tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
datatype:
enum: ["float64"]
unit:
tag: tag:stsci.edu:asdf/unit/unit-1.0.0
tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["sr"]
- type: "null"
archive_catalog:
Expand All @@ -51,12 +51,12 @@ properties:
pixelarea_arcsecsq:
title: Nominal pixel area in arcsec^2
anyOf:
- tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
- tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
datatype:
enum: ["float64"]
unit:
tag: tag:stsci.edu:asdf/unit/unit-1.0.0
tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["arcsec**2"]
- type: "null"
archive_catalog:
Expand All @@ -65,12 +65,12 @@ properties:
conversion_megajanskys_uncertainty:
title: Uncertainty in flux density conversion to MJy/steradians
anyOf:
- tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
- tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
datatype:
enum: ["float64"]
unit:
tag: tag:stsci.edu:asdf/unit/unit-1.0.0
tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["MJy.sr**-1"]
- type: "null"
archive_catalog:
Expand All @@ -79,12 +79,12 @@ properties:
conversion_microjanskys_uncertainty:
title: Uncertainty in flux density conversion to uJy/arcsec2
anyOf:
- tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
- tag: tag:stsci.edu:asdf/unit/quantity-1.*
properties:
datatype:
enum: ["float64"]
unit:
tag: tag:stsci.edu:asdf/unit/unit-1.0.0
tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["uJy.arcsec**-2"]
- type: "null"
archive_catalog:
Expand Down
Loading

0 comments on commit e85f964

Please sign in to comment.