From 108f4c16a9412c8d77e00dfa2b3bf2517416e96c Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 31 Oct 2024 16:48:45 -0400 Subject: [PATCH 01/40] add enum to S_ keywords --- .../jwst/datamodels/schemas/core.schema.yaml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 5f806b68..1777e10b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -2293,300 +2293,360 @@ properties: align_psfs: title: Coronagraphic PSF Alignment type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_PSFALI blend_table: True ami_analyze: title: AMI Fringe Analysis type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_AMIANA blend_table: True ami_average: title: AMI Fringe Averaging type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_AMIAVG blend_table: True ami_normalize: title: AMI Fringe Normalization type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_AMINOR blend_table: True assign_wcs: title: Assign World Coordinate System type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_WCS blend_table: True assign_mtwcs: title: Assign Moving Target World Coordinate System type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_MTWCS blend_table: True back_sub: title: Background subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_BKDSUB blend_table: True badpix_selfcal: title: Bad Pixel Self-Calibration type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_BPXSLF blend_table: True barshadow: title: Bar shadow correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_BARSHA blend_table: True charge_migration: title: Charge Migration type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_CHGMIG blend_table: True clean_flicker_noise: title: Clean flicker noise type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_CLNFNS blend_table: True combine_1d: title: 1-D Spectral Combination type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_COMB1D blend_table: True cube_build: title: IFU Cube Creation type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_IFUCUB blend_table: True dark_sub: title: Dark Subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_DARK blend_table: True dq_init: title: Data Quality Initialization type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_DQINIT blend_table: True emicorr: title: MIRI EMI Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_MIREMI blend_table: True emission: title: Telescope Emission Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_TELEMI blend_table: True err_init: title: Error Initialization type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_ERRINI blend_table: True extract_1d: title: 1-D Spectral Extraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_EXTR1D blend_table: True extract_2d: title: 2-D Spectral Extraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_EXTR2D blend_table: True firstframe: title: First Frame Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_FRSTFR blend_table: True flat_field: title: Flat Field Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_FLAT blend_table: True fringe: title: Fringe Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_FRINGE blend_table: True gain_scale: title: Gain Scale Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_GANSCL blend_table: True group_scale: title: Group Scale Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_GRPSCL blend_table: True guider_cds: title: Guide Mode CDS Computation type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_GUICDS blend_table: True imprint: title: NIRSpec MSA Imprint Subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_IMPRNT blend_table: True ipc: title: Interpixel Capacitance Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_IPC blend_table: True jump: title: Jump Detection type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_JUMP blend_table: True klip: title: Coronagraphic PSF Subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_KLIP blend_table: True lastframe: title: Last Frame Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_LASTFR blend_table: True linearity: title: Linearity Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_LINEAR blend_table: True master_background: title: Master Background Subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_MSBSUB blend_table: True mrs_imatch: title: MIRI MRS background matching type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_MRSMAT blend_table: True msa_flagging: title: NIRSpec MSA Stuck Shutter Flagging type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_MSAFLG blend_table: True nsclean: title: NIRSpec 1/f Noise Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_NSCLEN outlier_detection: title: Outlier Detection type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_OUTLIR blend_table: True pathloss: title: Pathloss Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_PTHLOS blend_table: True persistence: title: Persistence Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_PERSIS blend_table: True photom: title: Photometric Calibration type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_PHOTOM blend_table: True pixel_replace: title: Pixel Replacment type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_PXREPL blend_table: True ramp_fit: title: Ramp Fitting type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_RAMP blend_table: True refpix: title: Reference Pixel Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_REFPIX blend_table: True resample: title: Image resampling type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_RESAMP blend_table: True residual_fringe: title: Residual fringe Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_RESFRI blend_table: True reset: title: Reset Anomaly Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_RESET blend_table: True rscd: title: RSCD Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_RSCD blend_table: True saturation: title: Saturation Checking type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_SATURA blend_table: True skymatch: title: Sky Background Equalization or Subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_SKYMAT blend_table: True source_catalog: title: Source Photometry and Morphology type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_SRCCAT blend_table: True spectral_leak: title: MRS spectral leak type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_SPLEAK blend_table: True srctype: title: Source Type Determination type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_SRCTYP blend_table: True stack_psfs: title: Coronagraphic PSF Stacking type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_PSFSTK blend_table: True straylight: title: Straylight Correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_STRAY blend_table: True superbias: title: Superbias Subtraction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_SUPERB blend_table: True tso_photometry: title: TSO Imaging Photometry type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_TSPHOT blend_table: True tweakreg: title: Image Alignment via Astronomical Sources type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_TWKREG blend_table: True wavecorr: title: NIRSpec wavelength correction type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_WAVCOR blend_table: True wfs_combine: title: Wavefront Sensing Combination type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_WFSCOM blend_table: True white_light: title: TSO White-Light Curve type: string + enum: [SKIPPED, COMPLETE] fits_keyword: S_WHTLIT blend_table: True tweakreg_catalog: From 48c0b35c7beb4522172c50a357da0c942dfa8d70 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 31 Oct 2024 16:58:34 -0400 Subject: [PATCH 02/40] align cal_step titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 1777e10b..f3f41f9a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -2351,7 +2351,7 @@ properties: fits_keyword: S_CHGMIG blend_table: True clean_flicker_noise: - title: Clean flicker noise + title: Clean Flicker Noise type: string enum: [SKIPPED, COMPLETE] fits_keyword: S_CLNFNS @@ -2530,7 +2530,7 @@ properties: fits_keyword: S_PHOTOM blend_table: True pixel_replace: - title: Pixel Replacment + title: Pixel Replacement type: string enum: [SKIPPED, COMPLETE] fits_keyword: S_PXREPL @@ -2554,7 +2554,7 @@ properties: fits_keyword: S_RESAMP blend_table: True residual_fringe: - title: Residual fringe Correction + title: Residual Fringe Correction type: string enum: [SKIPPED, COMPLETE] fits_keyword: S_RESFRI From acb39c4d5ba1abe03b4ef5944a4c5845e42f7fa8 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 31 Oct 2024 17:00:37 -0400 Subject: [PATCH 03/40] align multispec titles --- .../jwst/datamodels/schemas/multispec.schema.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml index b8904788..41c0b89f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml @@ -16,7 +16,7 @@ allOf: spec_table: $ref: spectable.schema name: - title: Name of the slit + title: Slit name type: string fits_keyword: SLTNAME fits_hdu: EXTRACT1D @@ -111,13 +111,13 @@ allOf: fits_keyword: SHUTSTA fits_hdu: EXTRACT1D slit_ra: - title: Right ascension (deg) at middle of slit + title: "[deg] Right Ascension at middle of slit" type: number default: 0.0 fits_keyword: SLIT_RA fits_hdu: EXTRACT1D slit_dec: - title: Declination (deg) at middle of slit + title: "[deg] Declination at middle of slit" type: number default: 0.0 fits_keyword: SLIT_DEC From 228c1db3da4e984eb07f56b3cb8b5682faf6e80b Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 31 Oct 2024 17:14:47 -0400 Subject: [PATCH 04/40] align oifits titles --- src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml index 8807dd98..b6db07d1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml @@ -65,17 +65,17 @@ allOf: fits_keyword: OI_REVN fits_hdu: OI_ARRAY x: - title: Array center x (m) + title: "[m] Array center x" type: number fits_keyword: ARRAYX fits_hdu: OI_ARRAY y: - title: Array center y (m) + title: "[m] Array center y" type: number fits_keyword: ARRAYY fits_hdu: OI_ARRAY z: - title: Array center z (m) + title: "[m] Array center z" type: number fits_keyword: ARRAYZ fits_hdu: OI_ARRAY From cb70d1c8b5e61ff0d7ebdf5943721739216d9e9a Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:01:26 -0400 Subject: [PATCH 05/40] align DATAEND title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index f3f41f9a..755d72a4 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1690,7 +1690,7 @@ properties: type: number fits_keyword: DATASTRT data_end: - title: MJD end time of guider data within this file + title: "[d] MJD end time of guider data in this file" type: number fits_keyword: DATAEND gs_acq_exec_stat: From 3d975c1c9a1cf891598ebc2e70d4e363bbcf380e Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:02:50 -0400 Subject: [PATCH 06/40] align DATASTRT title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 755d72a4..5a1b2e60 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1686,7 +1686,7 @@ properties: type: string fits_keyword: GF_END data_start: - title: MJD start time of guider data within this file + title: "[d] MJD start time of guider data in this file" type: number fits_keyword: DATASTRT data_end: From d6c088b0292f01a250cf040e49f79f372601a22d Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:11:12 -0400 Subject: [PATCH 07/40] align DRPFRMS1 and DRPFRMS3 titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 5a1b2e60..911d74f6 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -821,12 +821,12 @@ properties: fits_keyword: GROUPGAP blend_table: True drop_frames1: - title: Frames dropped prior to first integration + title: Number of frames dropped prior to first integration type: integer fits_keyword: DRPFRMS1 blend_table: True drop_frames3: - title: Frames dropped between integrations + title: Number of frames dropped between integrations type: integer fits_keyword: DRPFRMS3 blend_table: True From a6900f63e3872a0f5fc49e80b0d9d7eab3ecae5e Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:14:17 -0400 Subject: [PATCH 08/40] align DSETSTRT title, remove enum, kwd says 1-10, no 0 --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 911d74f6..518fee6f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1312,9 +1312,8 @@ properties: fits_keyword: YOFFSET blend_table: True starting_set: - title: Starting 4-point set number + title: Starting 4-point set in dither set list type: integer - enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] fits_keyword: DSETSTRT number_of_sets: title: Total number of 4-point sets From 075427c1d35e20bb1ac82f7f40c435dd214ac9fa Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:40:09 -0400 Subject: [PATCH 09/40] allow integer FOCUSPOS --- src/stdatamodels/jwst/_kwtool/compare.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/stdatamodels/jwst/_kwtool/compare.py b/src/stdatamodels/jwst/_kwtool/compare.py index 9f3de367..60a3d5a0 100644 --- a/src/stdatamodels/jwst/_kwtool/compare.py +++ b/src/stdatamodels/jwst/_kwtool/compare.py @@ -65,6 +65,13 @@ def __repr__(self): }, }, }, + ("PRIMARY", "FOCUSPOS"): { + "type": { + "dmd": { + "union": {"integer"}, + }, + }, + }, } From bbc015d27e26c6398d44760e3a827a41bf6323b5 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:43:18 -0400 Subject: [PATCH 10/40] align GSCENTX GSCENTY titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 518fee6f..f4c1a0fc 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1698,12 +1698,12 @@ properties: fits_keyword: GSACSTAT blend_table: True gs_ctd_x: - title: "[arcsec] guide star centroid x position in FGS ideal frame" + title: "[arcsec] GuideStar x centroid (FGS ideal frame)" type: number fits_keyword: GSCENTX blend_table: True gs_ctd_y: - title: "[arcsec] guide star centroid y position in FGS ideal frame" + title: "[arcsec] GuideStar y centroid (FGS ideal frame)" type: number fits_keyword: GSCENTY blend_table: True From a690fbbd75b7bfce4894141d51edcb158256d79a Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:46:36 -0400 Subject: [PATCH 11/40] align GS_MUDEC and GS_MURA titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index f4c1a0fc..28808a35 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1713,12 +1713,12 @@ properties: fits_keyword: GS_EPOCH blend_table: True gs_mura: - title: Guide star IRCS right ascension proper motion + title: Guide star ICRS right ascension proper motion type: number fits_keyword: GS_MURA blend_table: True gs_mudec: - title: Guide star IRCS declination proper motion + title: Guide star ICRS declination proper motion type: number fits_keyword: GS_MUDEC blend_table: True From c6121b82be81afb2929af103767c3b68565d6f5f Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 08:58:52 -0400 Subject: [PATCH 12/40] align MODULE title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 28808a35..bf90495e 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -423,7 +423,7 @@ properties: blend_table: True blend_rule: multi module: - title: 'NIRCam module: A, B, or MULTIPLE' + title: 'NIRCam module: A, B or MULTIPLE' type: string enum: [A, B, MULTIPLE] fits_keyword: MODULE From a208c5772487f405bca026ec5d9e0b14583762b2 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:01:31 -0400 Subject: [PATCH 13/40] align MRSPRCHN title and enum --- src/stdatamodels/jwst/_kwtool/compare.py | 7 +++++++ src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/_kwtool/compare.py b/src/stdatamodels/jwst/_kwtool/compare.py index 60a3d5a0..76dbc70e 100644 --- a/src/stdatamodels/jwst/_kwtool/compare.py +++ b/src/stdatamodels/jwst/_kwtool/compare.py @@ -72,6 +72,13 @@ def __repr__(self): }, }, }, + ("PRIMARY", "MRSPRCHN"): { + "enum": { + "dmd": { + "difference": {"ALL"}, + }, + }, + } } diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index bf90495e..32cc54dd 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1335,7 +1335,7 @@ properties: type: string fits_keyword: DITHPNTS primary_channel: - title: MRS primary channel + title: Optimized MRS channel type: string enum: [ALL, ALL_MRS, CHANNEL1, CHANNEL2, CHANNEL3, CHANNEL4, IMAGER] fits_keyword: MRSPRCHN From 1d900f5dd9033116b4477d8b94df6ac6e179f948 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:03:59 -0400 Subject: [PATCH 14/40] align MU_RA MU_DEC MU_EPOCH titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 32cc54dd..c83e3b6a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -367,17 +367,17 @@ properties: fits_keyword: TARGUDEC blend_table: True proper_motion_ra: - title: Target proper motion in RA + title: "[arcsec/yr] Target proper motion in RA" type: number fits_keyword: MU_RA blend_table: True proper_motion_dec: - title: Target proper motion in Dec + title: "[arcsec/yr] Target proper motion in Dec" type: number fits_keyword: MU_DEC blend_table: True proper_motion_epoch: - title: Target proper motion epoch + title: Target proper motion epoch in UT type: string fits_keyword: MU_EPOCH blend_table: True From d1a8418cb7d2ba9b550d4db700e3b6bf02021f86 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:08:50 -0400 Subject: [PATCH 15/40] align NRESETS title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index c83e3b6a..4afcddac 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -893,7 +893,7 @@ properties: fits_keyword: NRSTSTRT blend_table: True nresets_between_ints: - title: Number of resets between integrations + title: Number of reset frames between integrations type: integer fits_keyword: NRESETS blend_table: True From e72705bd6ef0eedfa04c9593072d3042b8ab5328 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:10:05 -0400 Subject: [PATCH 16/40] align NRIMDTPT title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 4afcddac..3e1c26b6 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1229,7 +1229,7 @@ properties: fits_keyword: PATTNPTS blend_table: True dither_points: - title: Number of points in image dither pattern + title: Number of points in direct image dither pattern type: integer fits_keyword: NRIMDTPT blend_table: True From 15eeb965679b7056432a700ee33c562e7ccfabaf Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:10:30 -0400 Subject: [PATCH 17/40] align NRSTSTRT title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 3e1c26b6..f5a21f3a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -888,7 +888,7 @@ properties: blend_rule: sum blend_table: True nresets_at_start: - title: Number of resets at start of exposure + title: Number of reset frames at start of exposure type: integer fits_keyword: NRSTSTRT blend_table: True From 3c0ee81607c9ab71dc4bd1ed062bda06e49e22f9 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:15:13 -0400 Subject: [PATCH 18/40] align NUMDSETS title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index f5a21f3a..1b896fc0 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1316,7 +1316,7 @@ properties: type: integer fits_keyword: DSETSTRT number_of_sets: - title: Total number of 4-point sets + title: Number of 4-point sets in dither set list type: integer enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] fits_keyword: NUMDSETS From 112a153e104671e106727fd563c5676b3ee9bb18 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:15:53 -0400 Subject: [PATCH 19/40] align NUMDTHPT title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 1b896fc0..03798b69 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1219,7 +1219,7 @@ properties: fits_keyword: PATTSTRT blend_table: True total_points: - title: Total number of points in pattern + title: Total number of points in dither pattern type: integer fits_keyword: NUMDTHPT blend_table: True From c93ff3d48441ba1f6f0173281b5b30392802ff5e Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:18:56 -0400 Subject: [PATCH 20/40] align NWFSEST and PWFSEET titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 03798b69..8ffb7099 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -88,12 +88,12 @@ properties: fits_keyword: HGA_STOP blend_table: True pwfseet: - title: Previous WFS exposure end time + title: "[d] Previous WFS exposure end time in MJD" type: number fits_keyword: PWFSEET blend_table: True nwfsest: - title: Next WFS exposure start time + title: "[d] Next WFS exposure start time in MJD" type: number fits_keyword: NWFSEST blend_table: True From 1c744b69297e0230dbbd29498c1e2ba8e8912793 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:44:26 -0400 Subject: [PATCH 21/40] align PROP_RA and PROP_DEC titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 8ffb7099..b2d44abf 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -382,12 +382,12 @@ properties: fits_keyword: MU_EPOCH blend_table: True proposer_ra: - title: Proposer's target RA + title: "[deg] Proposer's target RA" type: number fits_keyword: PROP_RA blend_table: True proposer_dec: - title: Proposer's target Dec + title: "[deg] Proposer's target Dec" type: number fits_keyword: PROP_DEC blend_table: True From bb871b569765372ff0971a7ef01a52f43ae663d2 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:55:29 -0400 Subject: [PATCH 22/40] align R_ titles --- .../jwst/datamodels/schemas/core.schema.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index b2d44abf..2dc6a51a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1759,7 +1759,7 @@ properties: type: object properties: name: - title: NIRSpec operability reference file name + title: MSA operability reference file name type: string fits_keyword: R_MSAOPE blend_table: True @@ -1768,7 +1768,7 @@ properties: type: object properties: name: - title: Nirspec Barshadow reference file name + title: NIRSpec bar shadow reference file name type: string fits_keyword: R_BARSHA blend_table: True @@ -1867,7 +1867,7 @@ properties: type: object properties: name: - title: DFlat reference file name + title: Detector Flat reference file name type: string fits_keyword: R_DFLAT blend_table: True @@ -1876,7 +1876,7 @@ properties: type: object properties: name: - title: FFlat reference file name + title: Fore-optics Flat reference file name type: string fits_keyword: R_FFLAT blend_table: True @@ -1885,7 +1885,7 @@ properties: type: object properties: name: - title: SFlat reference file name + title: Spectrograph Flat reference file name type: string fits_keyword: R_SFLAT blend_table: True @@ -2011,7 +2011,7 @@ properties: type: object properties: name: - title: MIRI MRS mrsxartcorr reference file name + title: MRS Cross-Artifact Correction ref file name type: string fits_keyword: R_MRSXAR blend_table: True @@ -2047,7 +2047,7 @@ properties: type: object properties: name: - title: SOSS trace and wavecal reference file name + title: PASTASOSS reference file name type: string fits_keyword: R_PSTSOS blend_table: True @@ -2200,7 +2200,7 @@ properties: type: object properties: name: - title: Straylight reference file name + title: MRS Straylight reference file name type: string fits_keyword: R_STRAY blend_table: True From 383ca7a00a064f5c94322deaaeea0d7a21c4248a Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 09:57:06 -0400 Subject: [PATCH 23/40] align RA_REF titles --- src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml index 3acca19f..ee2b79d8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml @@ -305,7 +305,7 @@ properties: fits_hdu: SCI blend_table: True ra_ref: - title: "[deg] Right ascension of the reference point" + title: "[deg] Right Ascension of the reference point" type: number fits_keyword: RA_REF fits_hdu: SCI From dee541231ecae93653568dbf6249ba14e7180158 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 10:28:12 -0400 Subject: [PATCH 24/40] align SDP_VER title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 2dc6a51a..0108caf8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -33,7 +33,7 @@ properties: fits_keyword: FILENAME blend_table: True data_processing_software_version: - title: Data processing (DP) Software Version + title: Data Processing (DP) Software Version type: string fits_keyword: SDP_VER blend_table: True From 2f4d82e67925454cdbb6d2dc442f4649b184b674 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 10:29:19 -0400 Subject: [PATCH 25/40] align SPATNSTP title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 0108caf8..4eca9a5f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1287,7 +1287,7 @@ properties: fits_keyword: SPAT_NUM blend_table: True spatial_total_points: - title: Total number of steps in spatial direction + title: Number of steps in spatial direction type: integer fits_keyword: SPATNSTP blend_table: True From 107f15a42a2520be1070b0c51abe26a28704ccd2 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 10:31:45 -0400 Subject: [PATCH 26/40] align SPECNSTP title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 4eca9a5f..9b3118b2 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1267,7 +1267,7 @@ properties: fits_keyword: SPEC_NUM blend_table: True spectral_total_points: - title: Total number of steps in spectral direction + title: Number of steps in spectral direction type: integer fits_keyword: SPECNSTP blend_table: True From ad3e4ab0c9d1a22fcc75631f0bf4b70c86d499b0 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 10:34:56 -0400 Subject: [PATCH 27/40] align TARG_RA TARG_DEC TARGURA TARUDEC titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 9b3118b2..a7aa60d1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -347,22 +347,22 @@ properties: type: string fits_keyword: TARGDESC ra: - title: Target RA at mid time of exposure + title: "[deg] Target RA at mid time of exposure" type: number fits_keyword: TARG_RA blend_table: True dec: - title: Target Dec at mid time of exposure + title: "[deg] Target Dec at mid time of exposure" type: number fits_keyword: TARG_DEC blend_table: True ra_uncertainty: - title: Target RA uncertainty + title: "[arcsec] Target RA uncertainty" type: number fits_keyword: TARGURA blend_table: True dec_uncertainty: - title: Target Dec uncertainty + title: "[arcsec] Target Dec uncertainty" type: number fits_keyword: TARGUDEC blend_table: True From b13d913325723d78b8ea9dc4af225d329c705e1e Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 10:39:59 -0400 Subject: [PATCH 28/40] align VISITEND title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index a7aa60d1..87d9334a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1672,7 +1672,7 @@ properties: fits_keyword: PCS_MODE blend_table: True visit_end_time: - title: Observatory UTC time when the visit completed + title: Observatory UTC time when the visit ended type: string fits_keyword: VISITEND blend_table: True From 7655fff761ee8686171c0ca6cf8de7fc72e9e094 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 10:41:31 -0400 Subject: [PATCH 29/40] align XOFFSET YOFFSET titles --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 87d9334a..98281150 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1302,12 +1302,12 @@ properties: fits_keyword: SPTOFFST blend_table: True x_offset: - title: x offset from pattern starting position + title: "[arcsec] X offset in SI ideal coordinate frame" type: number fits_keyword: XOFFSET blend_table: True y_offset: - title: y offset from pattern starting position + title: "[arcsec] Y offset in SI ideal coordinate frame" type: number fits_keyword: YOFFSET blend_table: True From 62516e15f09e606ffb032333d24c45dfb96c2c77 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:02:57 -0400 Subject: [PATCH 30/40] align WTYPE title --- src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml index a7614a84..8e7fddec 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml @@ -43,7 +43,7 @@ allOf: type: number fits_keyword: ROIW weighting: - title: Weighting type (MSM,MIRIPSF,AREA) + title: "Weighting type (MSM, MIRIPSF, AREA)" type: string fits_keyword: WTYPE weight_power: From 23c29d06a445d1a713ce6c3a1109e9cf0a65a6e7 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:03:09 -0400 Subject: [PATCH 31/40] align crpix crval titles --- .../datamodels/schemas/wcsinfo.schema.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml index ee2b79d8..2d80475b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml @@ -72,37 +72,37 @@ properties: fits_hdu: SCI blend_table: True crpix1: - title: axis 1 coordinate of the reference pixel + title: Axis 1 pixel coordinate of ref point, 1-indexed type: number fits_keyword: CRPIX1 fits_hdu: SCI blend_table: True crpix2: - title: axis 2 coordinate of the reference pixel + title: Axis 2 pixel coordinate of ref point, 1-indexed type: number fits_keyword: CRPIX2 fits_hdu: SCI blend_table: True crpix3: - title: axis 3 coordinate of the reference pixel + title: Axis 3 pixel coordinate of ref point, 1-indexed type: number fits_keyword: CRPIX3 fits_hdu: SCI blend_table: True crval1: - title: first axis value at the reference pixel + title: Axis 1 coordinate value at reference point type: number fits_keyword: CRVAL1 fits_hdu: SCI blend_table: True crval2: - title: second axis value at the reference pixel + title: Axis 2 coordinate value at reference point type: number fits_keyword: CRVAL2 fits_hdu: SCI blend_table: True crval3: - title: third axis value at the reference pixel + title: Axis 3 coordinate value at reference point type: number fits_keyword: CRVAL3 fits_hdu: SCI @@ -216,25 +216,25 @@ properties: fits_hdu: SCI blend_table: True cd1_1: - title: linear transformation matrix element, CD matrix + title: Linear transformation matrix element type: number fits_keyword: CD1_1 fits_hdu: SCI blend_table: True cd1_2: - title: linear transformation matrix element, CD matrix + title: Linear transformation matrix element type: number fits_keyword: CD1_2 fits_hdu: SCI blend_table: True cd2_1: - title: linear transformation matrix element, CD matrix + title: Linear transformation matrix element type: number fits_keyword: CD2_1 fits_hdu: SCI blend_table: True cd2_2: - title: linear transformation matrix element, CD matrix + title: Linear transformation matrix element type: number fits_keyword: CD2_2 fits_hdu: SCI From 35a80b84452f70a01367fb630b1aec16571498b2 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:05:21 -0400 Subject: [PATCH 32/40] correct MJD-AVG typo --- .../jwst/datamodels/schemas/core.schema.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 98281150..a43f012e 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1370,73 +1370,73 @@ properties: fits_hdu: SCI blend_table: True spatial_x_bary: - title: "[km] barycentric JWST X coordinate at MJD_AVG" + title: "[km] barycentric JWST X coordinate at MJD-AVG" type: number fits_keyword: JWST_X fits_hdu: SCI blend_table: True spatial_y_bary: - title: "[km] barycentric JWST Y coordinate at MJD_AVG" + title: "[km] barycentric JWST Y coordinate at MJD-AVG" type: number fits_keyword: JWST_Y fits_hdu: SCI blend_table: True spatial_z_bary: - title: "[km] barycentric JWST Z coordinate at MJD_AVG" + title: "[km] barycentric JWST Z coordinate at MJD-AVG" type: number fits_keyword: JWST_Z fits_hdu: SCI blend_table: True spatial_x_geo: - title: "[m] geocentric JWST X coordinate at MJD_AVG" + title: "[m] geocentric JWST X coordinate at MJD-AVG" type: number fits_keyword: OBSGEO-X fits_hdu: SCI blend_table: True spatial_y_geo: - title: "[m] geocentric JWST Y coordinate at MJD_AVG" + title: "[m] geocentric JWST Y coordinate at MJD-AVG" type: number fits_keyword: OBSGEO-Y fits_hdu: SCI blend_table: True spatial_z_geo: - title: "[m] geocentric JWST Z coordinate at MJD_AVG" + title: "[m] geocentric JWST Z coordinate at MJD-AVG" type: number fits_keyword: OBSGEO-Z fits_hdu: SCI blend_table: True velocity_x_bary: - title: "[km/s] barycentric JWST X velocity at MJD_AVG" + title: "[km/s] barycentric JWST X velocity at MJD-AVG" type: number fits_keyword: JWST_DX fits_hdu: SCI blend_table: True velocity_y_bary: - title: "[km/s] barycentric JWST Y velocity at MJD_AVG" + title: "[km/s] barycentric JWST Y velocity at MJD-AVG" type: number fits_keyword: JWST_DY fits_hdu: SCI blend_table: True velocity_z_bary: - title: "[km/s] barycentric JWST Z velocity at MJD_AVG" + title: "[km/s] barycentric JWST Z velocity at MJD-AVG" type: number fits_keyword: JWST_DZ fits_hdu: SCI blend_table: True velocity_x_geo: - title: "[m/s] geocentric JWST X velocity at MJD_AVG" + title: "[m/s] geocentric JWST X velocity at MJD-AVG" type: number fits_keyword: OBSGEODX fits_hdu: SCI blend_table: True velocity_y_geo: - title: "[m/s] geocentric JWST Y velocity at MJD_AVG" + title: "[m/s] geocentric JWST Y velocity at MJD-AVG" type: number fits_keyword: OBSGEODY fits_hdu: SCI blend_table: True velocity_z_geo: - title: "[m/s] geocentric JWST Z velocity at MJD_AVG" + title: "[m/s] geocentric JWST Z velocity at MJD-AVG" type: number fits_keyword: OBSGEODZ fits_hdu: SCI From 4ef1df6b9431723d960b7e69285f513378620a4a Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:10:19 -0400 Subject: [PATCH 33/40] align PCX_X titles --- .../datamodels/schemas/wcsinfo.schema.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml index 2d80475b..69dd0916 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml @@ -162,55 +162,55 @@ properties: fits_hdu: SCI blend_table: True pc1_1: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC1_1 fits_hdu: SCI blend_table: True pc1_2: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC1_2 fits_hdu: SCI blend_table: True pc1_3: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC1_3 fits_hdu: SCI blend_table: True pc2_1: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC2_1 fits_hdu: SCI blend_table: True pc2_2: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC2_2 fits_hdu: SCI blend_table: True pc2_3: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC2_3 fits_hdu: SCI blend_table: True pc3_1: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC3_1 fits_hdu: SCI blend_table: True pc3_2: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC3_2 fits_hdu: SCI blend_table: True pc3_3: - title: linear transformation matrix element + title: Linear transformation matrix element type: number fits_keyword: PC3_3 fits_hdu: SCI From 74a5a668b99ad575b1f2d47829215b3030235fb7 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:11:22 -0400 Subject: [PATCH 34/40] align REFFRAME title --- src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index a43f012e..0ffe7898 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1352,7 +1352,7 @@ properties: type: object properties: reference_frame: - title: Ephemeris reference frame + title: "Ephemeris reference frame (EME2000)" type: string fits_keyword: REFFRAME fits_hdu: SCI From 263ede19028269b9ca36a90155e5229c86639951 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:13:23 -0400 Subject: [PATCH 35/40] align SHUTSTA title --- src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml index 47b8ef1a..a663924f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml @@ -83,7 +83,7 @@ properties: fits_keyword: SRCYPOS fits_hdu: SCI shutter_state: - title: All (open and closed) shutters in a slit + title: Status of all shutters in the slitlet type: string default: "" fits_keyword: SHUTSTA From f56fc383e4fb2eaca84cc8d58abbe2687d9ebada Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:16:16 -0400 Subject: [PATCH 36/40] align SLT keyword names --- .../jwst/datamodels/schemas/extract1dimage.schema.yaml | 2 +- .../jwst/datamodels/schemas/multiextract1d.schema.yaml | 2 +- .../jwst/datamodels/schemas/slitmeta.schema.yaml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml index f0ea1458..d53c893f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml @@ -13,7 +13,7 @@ allOf: default: 0.0 datatype: float32 name: - title: Name of the slit + title: Slit name type: string fits_keyword: SLTNAME fits_hdu: SCI diff --git a/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml index 4ba9bc54..afca47d1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml @@ -17,7 +17,7 @@ allOf: default: 0.0 datatype: float32 name: - title: Name of the slit + title: Slit name type: string fits_keyword: SLTNAME fits_hdu: SCI diff --git a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml index a663924f..8281e4c6 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml @@ -5,27 +5,27 @@ id: "http://stsci.edu/schemas/jwst_datamodel/slitmeta.schema" type: object properties: name: - title: Name of the slit + title: Slit name type: string fits_keyword: SLTNAME fits_hdu: SCI xstart: - title: Starting pixel in x direction + title: "Slit starting pixel index along axis 1" type: integer fits_keyword: SLTSTRT1 fits_hdu: SCI xsize: - title: Number of pixels in x direction + title: "Slit size along axis 1" type: integer fits_keyword: SLTSIZE1 fits_hdu: SCI ystart: - title: Starting pixel in y direction + title: "Slit starting pixel index along axis 2" type: integer fits_keyword: SLTSTRT2 fits_hdu: SCI ysize: - title: Number of pixels in y direction + title: "Slit size along axis 2" type: integer fits_keyword: SLTSIZE2 fits_hdu: SCI From d692204df456525cdd44c904cbeb9fb3eaf3a245 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:17:32 -0400 Subject: [PATCH 37/40] align SOURCEID title --- src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml | 2 +- src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml index 41c0b89f..a4ae81ec 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml @@ -27,7 +27,7 @@ allOf: fits_keyword: SLITID fits_hdu: EXTRACT1D source_id: - title: Source ID + title: Source ID number type: integer default: 0 fits_keyword: SOURCEID diff --git a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml index 8281e4c6..a2c09482 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml @@ -41,7 +41,7 @@ properties: fits_keyword: SHUTTRID fits_hdu: SCI source_id: - title: Source ID + title: Source ID number type: integer default: 0 fits_keyword: SOURCEID From 38974eed25c9c070bbc25c77220fddca858c886c Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:20:27 -0400 Subject: [PATCH 38/40] align S_REGION title --- src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml index 69dd0916..db612470 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml @@ -250,7 +250,7 @@ properties: fits_keyword: PS3_1 fits_hdu: SCI s_region: - title: spatial extent of the observation + title: "spatial extent of the observation, footprint" type: string default: " " fits_keyword: S_REGION From 1e3480991be6a8785f6c11785f4f77d68d94e921 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 11:22:22 -0400 Subject: [PATCH 39/40] align WAVSTART WAVEND titles --- src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml index db612470..ee6f2d55 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml @@ -257,13 +257,13 @@ properties: fits_hdu: SCI blend_table: True waverange_start: - title: lower bound of the default wavelength range + title: Lower bound of the default wavelength range type: number fits_keyword: WAVSTART fits_hdu: SCI blend_table: True waverange_end: - title: upper bound of the default wavelength range + title: Upper bound of the default wavelength range type: number fits_keyword: WAVEND fits_hdu: SCI From 3420dc9d7dcb6e46c4cb3e28c467076313738e8b Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 1 Nov 2024 15:51:14 -0400 Subject: [PATCH 40/40] add changelog --- changes/354.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/354.bugfix.rst diff --git a/changes/354.bugfix.rst b/changes/354.bugfix.rst new file mode 100644 index 00000000..e1476029 --- /dev/null +++ b/changes/354.bugfix.rst @@ -0,0 +1 @@ +Update schema FITS keyword titles to match keyword dictionary.