diff --git a/CHANGES.rst b/CHANGES.rst index f8a8f8c9b9..17d361ef1d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -59,6 +59,10 @@ residual_fringe - Use scipy.interpolate.BSpline instead of astropy.modeling.Spline1D in residual_fringe fitting utils [#7764] +set_telescope_pointing +---------------------- + +- Commanded Guide Star is always relative to FGS1 [#7804] 1.11.3 (2023-07-17) =================== diff --git a/jwst/lib/set_telescope_pointing.py b/jwst/lib/set_telescope_pointing.py index 0f30c69c24..4e88c15646 100644 --- a/jwst/lib/set_telescope_pointing.py +++ b/jwst/lib/set_telescope_pointing.py @@ -258,8 +258,8 @@ class Transforms: m_eci2sifov: np.array = None #: ECI to V m_eci2v: np.array = None - #: FGS1 to FGSx transformation - m_fgs12fgsx: np.array = None + #: FGSX to Guide Stars transformation + m_fgsx2gs: np.array = None #: FGS1 to SIFOV m_fgs12sifov: np.array = None #: Velocity aberration @@ -2233,13 +2233,19 @@ def calc_v3pags(t_pars: TransformParameters): ------- v3pags : float The V3 Position Angle at the Guide Star, in degrees + + Notes + ----- + Modification for `jwst` release post-1.11.3: The commanded position of the guide + star is always relative to FGS1. Hence, the aperture to use for the SIAF + transformation is always FGS1. """ # Determine Guides Star estimated WCS information. gs_wcs = calc_estimated_gs_wcs(t_pars) - # Retrieve the Ideal Y-angle for the desired FGS - fgs_siaf = t_pars.siaf_db.get_wcs(FGSId2Aper[t_pars.fgsid], useafter=t_pars.useafter) + # Retrieve the Ideal Y-angle for FGS1 + fgs_siaf = t_pars.siaf_db.get_wcs(FGSId2Aper[1], useafter=t_pars.useafter) # Calculate V3PAGS v3pags = gs_wcs.pa - fgs_siaf.v3yangle @@ -2279,8 +2285,7 @@ def calc_m_eci2gs(t_pars: TransformParameters): M_eci_to_gs = M_z_to_x * M_gsics_to_gsappics * - M_fgsics_to_gsics * - M_fgs1ics_to_M_fgsics * + M_fgs1ics_to_gsics * M_j_to_fgs1ics * M_eci_to_j @@ -2288,11 +2293,16 @@ def calc_m_eci2gs(t_pars: TransformParameters): M_eci_to_gs = ECI to Guide Star Ideal Frame M_gsics_to_gsappics = Velocity Aberration correction - M_fgsics_to_gsics = Convert from the FGS ICS frame to Guide Star ICS frame - M_fgs1ics_to_fgsics = Convert from the FGS1 ICS frame to the in-use FGS ICS frame + M_fgs1ics_to_gsics = Convert from the FGS1 ICS frame to Guide Star ICS frame M_j_to_fgs1ics = Convert from J frame to FGS1 ICS frame M_eci_to_j = ECI (quaternion) to J-frame + Modification for `jwst` release post-1.11.3: The commanded position of the guide + star is always relative to FGS1. Hence, the aperture to use is always FGS1. + The formulae above have been modified appropriately. + However, in the code, note that the transformations go to FGS1, but then + is suddenly referred to thereafter as FGSX. The assumption to make is that X is always 1, + for FGS1. """ # Initial state of the transforms @@ -2300,13 +2310,12 @@ def calc_m_eci2gs(t_pars: TransformParameters): t.m_eci2j = calc_eci2j_matrix(t_pars.pointing.q) t.m_j2fgs1 = calc_j2fgs1_matrix(t_pars.pointing.j2fgs_matrix, t_pars.j2fgs_transpose) - t.m_fgs12fgsx = calc_m_fgs12fgsx(t_pars.fgsid, t_pars.siaf_db) t.m_fgsx2gs = calc_m_fgsx2gs(t_pars.pointing.gs_commanded) # Apply the Velocity Aberration. To do so, the M_eci2gsics matrix must be created. This # is used to calculate the aberration matrix. # Also, since the aberration is to be removed, the velocity is negated. - m_eci2gsics = np.linalg.multi_dot([t.m_fgsx2gs, t.m_fgs12fgsx, t.m_j2fgs1, t.m_eci2j]) + m_eci2gsics = np.linalg.multi_dot([t.m_fgsx2gs, t.m_j2fgs1, t.m_eci2j]) logger.debug('m_eci2gsics: %s', m_eci2gsics) t.m_gs2gsapp = calc_gs2gsapp(m_eci2gsics, t_pars.jwst_velocity) diff --git a/jwst/lib/tests/data/add_wcs_with_mast_fgs2.fits b/jwst/lib/tests/data/add_wcs_with_mast_fgs2.fits index 7deac89904..766aaacda2 100644 --- a/jwst/lib/tests/data/add_wcs_with_mast_fgs2.fits +++ b/jwst/lib/tests/data/add_wcs_with_mast_fgs2.fits @@ -1,20 +1,20 @@ -SIMPLE = T / conforms to FITS standard BITPIX = 8 / array data type NAXIS = 0 / number of array dimensions EXTEND = T DATE = '2022-07-29T03:36:27.823' / UTC date file created FILENAME= 'add_wcs_with_mast_fgs2.fits' / Name of the file DATAMODL= 'Level1bModel' / Type of data model Observation identifiers DATE-OBS= '2017-01-01' / [yyyy-mm-dd] UTC date at start of exposure Visit information ENGQLPTG= 'CALCULATED_COARSE_TR_202111' / Quality of pointing information from E Target information TARG_RA = 345.0 / Target RA at mid time of exposure TARG_DEC= -87.0 / Target Dec at mid time of exposure Exposure parameters EXP_TYPE= 'MIR_IMAGE' / Type of data in the exposure EXPSTART= 59612.93401553241 / UTC exposure start time EXPEND = 59612.93500967592 / UTC exposure end time Aperture information APERNAME= 'MIRIM_FULL' / PRD science aperture used Guide star information GS_RA = 345.0001 / guide star right ascension GS_DEC = -86.9999 / guide star declination PCS_MODE= 'COARSE ' / Pointing Control System mode END XTENSION= 'IMAGE ' / Image extension BITPIX = 8 / array data type NAXIS = 0 / number of array dimensions PCOUNT = 0 / number of parameters GCOUNT = 1 / number of groups EXTNAME = 'SCI ' / extension name JWST ephemeris information JWST_DX = -25.021 / [km/s] barycentric JWST X velocity at MJD_AVG JWST_DY = -16.507 / [km/s] barycentric JWST Y velocity at MJD_AVG JWST_DZ = -7.187 / [km/s] barycentric JWST Z velocity at MJD_AVG PA_APER = 199.2645658726951 / [deg] Position angle of aperture used Information about the coordinates in the file RADESYS = 'ICRS ' / Name of the coordinate reference frame Spacecraft pointing information RA_V1 = 146.5387546976359 / [deg] RA of telescope V1 axis DEC_V1 = 63.08649953925594 / [deg] Dec of telescope V1 axis PA_V3 = 194.137901240137 / [deg] Position angle of telescope V3 axis WCS parameters WCSAXES = 2 / number of World Coordinate System axes CRPIX1 = 693.5 / axis 1 coordinate of the reference pixel CRPIX2 = 512.5 / axis 2 coordinate of the reference pixel CRVAL1 = 146.8653699465779 / first axis value at the reference pixel CRVAL2 = 63.15605456767967 / second axis value at the reference pixel CTYPE1 = 'RA---TAN' / first axis coordinate type CTYPE2 = 'DEC--TAN' / second axis coordinate type CUNIT1 = 'deg ' / first axis units CUNIT2 = 'deg ' / second axis units CDELT1 = 3.06939222222222E-05 / first axis increment per pixel CDELT2 = 3.09266472222222E-05 / second axis increment per pixel PC1_1 = 0.9440051751266197 / linear transformation matrix element PC1_2 = -0.3299306432178738 / linear transformation matrix element PC2_1 = -0.3299306432178738 / linear transformation matrix element PC2_2 = -0.9440051751266197 / linear transformation matrix element S_REGION= 'POLYGON ICRS 146.832293799 63.177744144 146.898702705 &' CONTINUE '63.167399443 146.875421176 63.137883884 146.809715061 63.148171557&' CONTINUE '' / spatial extent of the observation V2_REF = -453.37849 / [arcsec] Telescope V2 coord of reference point V3_REF = -373.810549 / [arcsec] Telescope V3 coord of reference point VPARITY = -1 / Relative sense of rotation between Ideal xy andV3I_YANG= 4.83544897 / [deg] Angle from V3 axis to Ideal y axis RA_REF = 146.8653699465779 / [deg] Right ascension of the reference point DEC_REF = 63.15605456767967 / [deg] Declination of the reference point ROLL_REF= 194.4291169026951 / [deg] V3 roll angle at the ref point (N over E)END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / array data type NAXIS = 2 / number of array dimensions NAXIS1 = 1871 / length of dimension 1 NAXIS2 = 1 / length of dimension 2 PCOUNT = 0 / number of group parameters GCOUNT = 1 / number of groups TFIELDS = 1 / number of table fields TTYPE1 = 'ASDF_METADATA' TFORM1 = '1871B ' EXTNAME = 'ASDF ' / extension name END #ASDF 1.0.0 +SIMPLE = T / conforms to FITS standard BITPIX = 8 / array data type NAXIS = 0 / number of array dimensions EXTEND = T DATE = '2023-08-09T15:51:55.078' / UTC date file created FILENAME= 'add_wcs_with_mast_fgs2.fits' / Name of the file DATAMODL= 'Level1bModel' / Type of data model Observation identifiers DATE-OBS= '2017-01-01' / [yyyy-mm-dd] UTC date at start of exposure Visit information ENGQLPTG= 'CALCULATED_COARSE_TR_202111' / Quality of pointing information from E Target information TARG_RA = 345.0 / Target RA at mid time of exposure TARG_DEC= -87.0 / Target Dec at mid time of exposure Exposure parameters EXP_TYPE= 'MIR_IMAGE' / Type of data in the exposure EXPSTART= 59612.93401553241 / [d] exposure start time in MJD EXPEND = 59612.93500967592 / [d] exposure end time in MJD Aperture information APERNAME= 'MIRIM_FULL' / PRD science aperture used Guide star information GS_RA = 345.0001 / guide star right ascension GS_DEC = -86.9999 / guide star declination PCS_MODE= 'COARSE ' / Pointing Control System mode END XTENSION= 'IMAGE ' / Image extension BITPIX = 8 / array data type NAXIS = 0 / number of array dimensions PCOUNT = 0 / number of parameters GCOUNT = 1 / number of groups EXTNAME = 'SCI ' / extension name JWST ephemeris information JWST_DX = -25.021 / [km/s] barycentric JWST X velocity at MJD_AVG JWST_DY = -16.507 / [km/s] barycentric JWST Y velocity at MJD_AVG JWST_DZ = -7.187 / [km/s] barycentric JWST Z velocity at MJD_AVG PA_APER = 197.64041827955012 / [deg] Position angle of aperture used Information about the coordinates in the file RADESYS = 'ICRS ' / Name of the coordinate reference frame Spacecraft pointing information RA_V1 = 146.44048475354992 / [deg] RA of telescope V1 axis DEC_V1 = 63.097437243493864 / [deg] Dec of telescope V1 axis PA_V3 = 192.51759331113286 / [deg] Position angle of telescope V3 axis WCS parameters WCSAXES = 2 / number of World Coordinate System axes CRPIX1 = 693.5 / axis 1 coordinate of the reference pixel CRPIX2 = 512.5 / axis 2 coordinate of the reference pixel CRVAL1 = 146.76275818640502 / first axis value at the reference pixel CRVAL2 = 63.17114468052803 / second axis value at the reference pixel CTYPE1 = 'RA---TAN' / Axis 1 type CTYPE2 = 'DEC--TAN' / Axis 2 type CUNIT1 = 'deg ' / Axis 1 units CUNIT2 = 'deg ' / Axis 2 units CDELT1 = 3.06939222222222E-05 / Axis 1 coordinate increment at reference point CDELT2 = 3.09266472222222E-05 / Axis 2 coordinate increment at reference point PC1_1 = 0.9529771292266744 / linear transformation matrix element PC1_2 = -0.3030422267125265 / linear transformation matrix element PC2_1 = -0.3030422267125265 / linear transformation matrix element PC2_2 = -0.9529771292266744 / linear transformation matrix element S_REGION= 'POLYGON ICRS 146.728315261 63.192402208 146.795382414 &' CONTINUE '63.182911608 146.773951023 63.153109933 146.707592279 63.162552529&' CONTINUE '' / spatial extent of the observation V2_REF = -453.37849 / [arcsec] Telescope V2 coord of reference point V3_REF = -373.810549 / [arcsec] Telescope V3 coord of reference point VPARITY = -1 / Relative sense of rotation between Ideal xy andV3I_YANG= 4.83544897 / [deg] Angle from V3 axis to Ideal y axis RA_REF = 146.76275818640502 / [deg] Right ascension of the reference point DEC_REF = 63.17114468052803 / [deg] Declination of the reference point ROLL_REF= 192.80496930955013 / [deg] V3 roll angle at the ref point (N over E)END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / array data type NAXIS = 2 / number of array dimensions NAXIS1 = 1873 / length of dimension 1 NAXIS2 = 1 / length of dimension 2 PCOUNT = 0 / number of group parameters GCOUNT = 1 / number of groups TFIELDS = 1 / number of table fields TTYPE1 = 'ASDF_METADATA' TFORM1 = '1873B ' EXTNAME = 'ASDF ' / extension name END #ASDF 1.0.0 #ASDF_STANDARD 1.5.0 %YAML 1.1 %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} -_fits_hash: b6c84b103c37603e84f933c5ddb919375ab851c1d9c4ab33a7f71b6d74ac529b + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} +_fits_hash: f06ce9585c7ba9b1fda73cefd8b89c1d04798506b7b247a4be5e3970b440ecae meta: - aperture: {name: MIRIM_FULL, position_angle: 199.26456587269513} + aperture: {name: MIRIM_FULL, position_angle: 197.64041827955012} coordinates: {reference_frame: ICRS} - date: '2022-07-29T03:36:27.823' + date: '2023-08-09T15:51:55.078' ephemeris: {velocity_x_bary: -25.021, velocity_y_bary: -16.507, velocity_z_bary: -7.187} exposure: {end_time: 59612.93500967592, start_time: 59612.93401553241, type: MIR_IMAGE} filename: add_wcs_with_mast_fgs2.fits @@ -22,16 +22,16 @@ meta: instrument: {} model_type: Level1bModel observation: {date: '2017-01-01'} - pointing: {dec_v1: 63.08649953925594, pa_v3: 194.13790124013704, ra_v1: 146.5387546976359} + pointing: {dec_v1: 63.097437243493864, pa_v3: 192.51759331113286, ra_v1: 146.44048475354992} target: {dec: -87.0, ra: 345.0} visit: {engdb_pointing_quality: CALCULATED_COARSE_TR_202111} wcsinfo: {cdelt1: 3.0693922222222226e-05, cdelt2: 3.092664722222222e-05, crpix1: 693.5, - crpix2: 512.5, crval1: 146.86536994657789, crval2: 63.15605456767967, ctype1: RA---TAN, - ctype2: DEC--TAN, cunit1: deg, cunit2: deg, dec_ref: 63.15605456767967, pc1_1: 0.9440051751266197, - pc1_2: -0.3299306432178738, pc2_1: -0.3299306432178738, pc2_2: -0.9440051751266197, - ra_ref: 146.86536994657789, roll_ref: 194.42911690269514, s_region: POLYGON ICRS 146.832293799 - 63.177744144 146.898702705 63.167399443 146.875421176 63.137883884 146.809715061 - 63.148171557, v2_ref: -453.37849, v3_ref: -373.810549, v3yangle: 4.83544897, + crpix2: 512.5, crval1: 146.76275818640502, crval2: 63.17114468052803, ctype1: RA---TAN, + ctype2: DEC--TAN, cunit1: deg, cunit2: deg, dec_ref: 63.17114468052803, pc1_1: 0.9529771292266744, + pc1_2: -0.3030422267125265, pc2_1: -0.3030422267125265, pc2_2: -0.9529771292266744, + ra_ref: 146.76275818640502, roll_ref: 192.80496930955013, s_region: POLYGON ICRS 146.728315261 + 63.192402208 146.795382414 63.182911608 146.773951023 63.153109933 146.707592279 + 63.162552529, v2_ref: -453.37849, v3_ref: -373.810549, v3yangle: 4.83544897, vparity: -1, wcsaxes: 2} ... - \ No newline at end of file + \ No newline at end of file diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202107.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202107.asdf index f72bbf58f6..6009e8c8c4 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202107.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202107.asdf @@ -39,13 +39,6 @@ transforms: - [-0.5518060482351074, 0.8193850752853762, 0.15530054167014012] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 - data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] - datatype: float64 - shape: [3, 3] m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_any-1.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_any-1.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_any-1.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_any-1.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_any-2.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_any-2.asdf index 821c80a14b..ed7750fce6 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_any-2.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_any-2.asdf @@ -4,19 +4,19 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 data: - - [-0.16012149057232664, -0.2908040237793363, 0.9432890514053922] - - [0.8207914404533206, 0.49161608192824224, 0.2908867226991892] - - [-0.5483271146423015, 0.8208207426009019, 0.15997111599758868] + - [-0.1593953868302445, -0.2903579259648071, 0.9435494114968239] + - [0.8059756222312516, 0.5136513245748495, 0.294220421847337] + - [-0.5700846534881251, 0.8073751515451433, 0.15214772206459828] datatype: float64 shape: [3, 3] m_eci2j: !core/ndarray-1.0.0 @@ -28,27 +28,27 @@ transforms: shape: [3, 3] m_eci2siaf: !core/ndarray-1.0.0 data: - - [-0.1601269863725518, -0.289801221963818, 0.9435966863108275] - - [-0.8126204209445734, -0.5039697566677751, -0.2926817051183823] - - [-0.5603637254637395, 0.8136521245920312, 0.15479919563646075] + - [-0.15942849151092672, -0.28935415824970223, 0.9438521248535333] + - [-0.7974814680282233, -0.5258018404798147, -0.2958982506456639] + - [-0.581898590273763, 0.799879140490781, 0.1469267490002397] datatype: float64 shape: [3, 3] m_eci2sifov: null m_eci2v: !core/ndarray-1.0.0 data: - - [-0.16201716376125577, -0.28799646682953906, 0.9438265625161674] - - [0.8179907925032919, 0.4957852482668379, 0.29169864009870416] - - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] + - [-0.1613654044637797, -0.2875969156954648, 0.944060022804711] + - [0.8030644717531688, 0.5177517995440696, 0.2949924935755193] + - [-0.573627723847564, 0.8057425965480279, 0.14741160053923583] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [0.9996419130561, -0.026744227336415103, 0.0008899245580707779] - - [0.026744226747233042, 0.999642309117531, 1.2564354962991238e-05] - - [-0.0008899422641357363, 1.124048833745535e-05, 0.9999996039381304] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_any-None.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_any-None.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_any-None.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_any-None.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-1.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-1.asdf index 821c80a14b..ed7750fce6 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-1.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-1.asdf @@ -4,19 +4,19 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 data: - - [-0.16012149057232664, -0.2908040237793363, 0.9432890514053922] - - [0.8207914404533206, 0.49161608192824224, 0.2908867226991892] - - [-0.5483271146423015, 0.8208207426009019, 0.15997111599758868] + - [-0.1593953868302445, -0.2903579259648071, 0.9435494114968239] + - [0.8059756222312516, 0.5136513245748495, 0.294220421847337] + - [-0.5700846534881251, 0.8073751515451433, 0.15214772206459828] datatype: float64 shape: [3, 3] m_eci2j: !core/ndarray-1.0.0 @@ -28,27 +28,27 @@ transforms: shape: [3, 3] m_eci2siaf: !core/ndarray-1.0.0 data: - - [-0.1601269863725518, -0.289801221963818, 0.9435966863108275] - - [-0.8126204209445734, -0.5039697566677751, -0.2926817051183823] - - [-0.5603637254637395, 0.8136521245920312, 0.15479919563646075] + - [-0.15942849151092672, -0.28935415824970223, 0.9438521248535333] + - [-0.7974814680282233, -0.5258018404798147, -0.2958982506456639] + - [-0.581898590273763, 0.799879140490781, 0.1469267490002397] datatype: float64 shape: [3, 3] m_eci2sifov: null m_eci2v: !core/ndarray-1.0.0 data: - - [-0.16201716376125577, -0.28799646682953906, 0.9438265625161674] - - [0.8179907925032919, 0.4957852482668379, 0.29169864009870416] - - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] + - [-0.1613654044637797, -0.2875969156954648, 0.944060022804711] + - [0.8030644717531688, 0.5177517995440696, 0.2949924935755193] + - [-0.573627723847564, 0.8057425965480279, 0.14741160053923583] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [0.9996419130561, -0.026744227336415103, 0.0008899245580707779] - - [0.026744226747233042, 0.999642309117531, 1.2564354962991238e-05] - - [-0.0008899422641357363, 1.124048833745535e-05, 0.9999996039381304] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-2.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-2.asdf index 821c80a14b..ed7750fce6 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-2.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-2.asdf @@ -4,19 +4,19 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 data: - - [-0.16012149057232664, -0.2908040237793363, 0.9432890514053922] - - [0.8207914404533206, 0.49161608192824224, 0.2908867226991892] - - [-0.5483271146423015, 0.8208207426009019, 0.15997111599758868] + - [-0.1593953868302445, -0.2903579259648071, 0.9435494114968239] + - [0.8059756222312516, 0.5136513245748495, 0.294220421847337] + - [-0.5700846534881251, 0.8073751515451433, 0.15214772206459828] datatype: float64 shape: [3, 3] m_eci2j: !core/ndarray-1.0.0 @@ -28,27 +28,27 @@ transforms: shape: [3, 3] m_eci2siaf: !core/ndarray-1.0.0 data: - - [-0.1601269863725518, -0.289801221963818, 0.9435966863108275] - - [-0.8126204209445734, -0.5039697566677751, -0.2926817051183823] - - [-0.5603637254637395, 0.8136521245920312, 0.15479919563646075] + - [-0.15942849151092672, -0.28935415824970223, 0.9438521248535333] + - [-0.7974814680282233, -0.5258018404798147, -0.2958982506456639] + - [-0.581898590273763, 0.799879140490781, 0.1469267490002397] datatype: float64 shape: [3, 3] m_eci2sifov: null m_eci2v: !core/ndarray-1.0.0 data: - - [-0.16201716376125577, -0.28799646682953906, 0.9438265625161674] - - [0.8179907925032919, 0.4957852482668379, 0.29169864009870416] - - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] + - [-0.1613654044637797, -0.2875969156954648, 0.944060022804711] + - [0.8030644717531688, 0.5177517995440696, 0.2949924935755193] + - [-0.573627723847564, 0.8057425965480279, 0.14741160053923583] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [0.9996419130561, -0.026744227336415103, 0.0008899245580707779] - - [0.026744226747233042, 0.999642309117531, 1.2564354962991238e-05] - - [-0.0008899422641357363, 1.124048833745535e-05, 0.9999996039381304] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-None.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-None.asdf index 821c80a14b..ed7750fce6 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-None.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider1-None.asdf @@ -4,19 +4,19 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 data: - - [-0.16012149057232664, -0.2908040237793363, 0.9432890514053922] - - [0.8207914404533206, 0.49161608192824224, 0.2908867226991892] - - [-0.5483271146423015, 0.8208207426009019, 0.15997111599758868] + - [-0.1593953868302445, -0.2903579259648071, 0.9435494114968239] + - [0.8059756222312516, 0.5136513245748495, 0.294220421847337] + - [-0.5700846534881251, 0.8073751515451433, 0.15214772206459828] datatype: float64 shape: [3, 3] m_eci2j: !core/ndarray-1.0.0 @@ -28,27 +28,27 @@ transforms: shape: [3, 3] m_eci2siaf: !core/ndarray-1.0.0 data: - - [-0.1601269863725518, -0.289801221963818, 0.9435966863108275] - - [-0.8126204209445734, -0.5039697566677751, -0.2926817051183823] - - [-0.5603637254637395, 0.8136521245920312, 0.15479919563646075] + - [-0.15942849151092672, -0.28935415824970223, 0.9438521248535333] + - [-0.7974814680282233, -0.5258018404798147, -0.2958982506456639] + - [-0.581898590273763, 0.799879140490781, 0.1469267490002397] datatype: float64 shape: [3, 3] m_eci2sifov: null m_eci2v: !core/ndarray-1.0.0 data: - - [-0.16201716376125577, -0.28799646682953906, 0.9438265625161674] - - [0.8179907925032919, 0.4957852482668379, 0.29169864009870416] - - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] + - [-0.1613654044637797, -0.2875969156954648, 0.944060022804711] + - [0.8030644717531688, 0.5177517995440696, 0.2949924935755193] + - [-0.573627723847564, 0.8057425965480279, 0.14741160053923583] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [0.9996419130561, -0.026744227336415103, 0.0008899245580707779] - - [0.026744226747233042, 0.999642309117531, 1.2564354962991238e-05] - - [-0.0008899422641357363, 1.124048833745535e-05, 0.9999996039381304] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-1.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-1.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-1.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-1.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-2.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-2.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-2.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-2.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-None.asdf b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-None.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-None.asdf +++ b/jwst/lib/tests/data/tforms_coarse_tr_202111_guider2-None.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_ops_tr_202111.asdf b/jwst/lib/tests/data/tforms_ops_tr_202111.asdf index c25b1d49af..aa6f454d4f 100644 --- a/jwst/lib/tests/data/tforms_ops_tr_202111.asdf +++ b/jwst/lib/tests/data/tforms_ops_tr_202111.asdf @@ -4,12 +4,12 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: !core/ndarray-1.0.0 @@ -41,14 +41,14 @@ transforms: - [-0.5519434818376673, 0.8193015723378767, 0.1552527009457648] datatype: float64 shape: [3, 3] - m_fgs12fgsx: !core/ndarray-1.0.0 + m_fgs12sifov: null + m_fgsx2gs: !core/ndarray-1.0.0 data: - - [1.0, 0.0, 0.0] - - [0.0, 1.0, 0.0] - - [0.0, 0.0, 1.0] + - [0.999999994103044, -4.30613613606694e-09, 0.00010859977892459698] + - [0.0, 0.9999999992138822, 3.965142632262306e-05] + - [-0.0001085997790099692, -3.965142608880034e-05, 0.9999999933169261] datatype: float64 shape: [3, 3] - m_fgs12sifov: null m_gs2gsapp: !core/ndarray-1.0.0 data: - [1.0, 0.0, 0.0] diff --git a/jwst/lib/tests/data/tforms_track_tr_202107.asdf b/jwst/lib/tests/data/tforms_track_tr_202107.asdf index 4e1abde123..5b6ccd48ae 100644 --- a/jwst/lib/tests/data/tforms_track_tr_202107.asdf +++ b/jwst/lib/tests/data/tforms_track_tr_202107.asdf @@ -29,7 +29,6 @@ transforms: - [-0.5519140390738069, 0.8193200898511738, 0.15525940821573725] datatype: float64 shape: [3, 3] - m_fgs12fgsx: null m_fgs12sifov: null m_gs2gsapp: null m_j2fgs1: null diff --git a/jwst/lib/tests/data/tforms_track_tr_202111.asdf b/jwst/lib/tests/data/tforms_track_tr_202111.asdf index d6e5571899..6b5d6d1a04 100644 --- a/jwst/lib/tests/data/tforms_track_tr_202111.asdf +++ b/jwst/lib/tests/data/tforms_track_tr_202111.asdf @@ -4,33 +4,33 @@ %TAG ! tag:stsci.edu:asdf/ --- !core/asdf-1.1.0 asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf', - name: asdf, version: 2.12.0} + name: asdf, version: 2.15.0} history: extensions: - !core/extension_metadata-1.0.0 extension_class: asdf.extension.BuiltinExtension - software: !core/software-1.0.0 {name: asdf, version: 2.12.0} + software: !core/software-1.0.0 {name: asdf, version: 2.15.0} transforms: m_eci2fgs1: null m_eci2gs: null m_eci2j: null m_eci2siaf: !core/ndarray-1.0.0 data: - - [-0.16004489452345466, -0.28974832666619305, 0.9436268006638626] - - [-0.8125625905417139, -0.5041070234836338, -0.2926057848481643] - - [-0.5604709342946476, 0.813585899624995, 0.15475889551903776] + - [-0.16004489452345463, -0.28974832666619305, 0.9436268006638625] + - [-0.8125625905417138, -0.5041070234836337, -0.2926057848481643] + - [-0.5604709342946476, 0.8135858996249948, 0.15475889551903776] datatype: float64 shape: [3, 3] m_eci2sifov: null m_eci2v: !core/ndarray-1.0.0 data: - - [-0.1619353146565979, -0.2879438182187553, 0.9438566159203807] - - [0.8179340657524773, 0.49592318973483573, 0.29162313688191543] - - [-0.5520514631342722, 0.8192365637792485, 0.15521158016874448] + - [-0.16193531465659788, -0.2879438182187553, 0.9438566159203806] + - [0.8179340657524772, 0.4959231897348356, 0.29162313688191543] + - [-0.5520514631342722, 0.8192365637792484, 0.15521158016874448] datatype: float64 shape: [3, 3] - m_fgs12fgsx: null m_fgs12sifov: null + m_fgsx2gs: null m_gs2gsapp: null m_j2fgs1: null m_sifov2v: null