Badengqlptg (#6264)

Changes * Ensure the formatted table has a string repr of source. * Fix writing of the engineering quality keyword * update changelog [skip ci] The entry is added under a 1.3.1 section for easy pickings (cherry picked from commit c9748db)
spacetelescope · Aug 9, 2021 · ce8a543 · ce8a543
1 parent 4235b1d
commit ce8a543
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 51 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,11 @@
+1.3.1 (2021-08-09)
+==================
+
+lib
+---
+
+- Fixed a bug in set_telescope_pointing that was setting wrong meta for the pointing quality [#6264]
+
 1.3.0 (2021-07-31)
 ==================
 

diff --git a/JenkinsfileRT b/JenkinsfileRT
@@ -40,7 +40,7 @@ withCredentials([string(
 jobconfig = new JobConfig()
 jobconfig.enable_env_publication = true
 jobconfig.publish_env_on_success_only = true
-jobconfig.publish_env_filter = "spacetelescope/master"
+jobconfig.publish_env_filter = "spacetelescope/1.3.x"
 
 // Define python version for conda
 python_version = "3.8"

diff --git a/jwst/lib/set_telescope_pointing.py b/jwst/lib/set_telescope_pointing.py
@@ -701,7 +701,7 @@ def update_wcs_from_telem(model, t_pars: TransformParameters):
             wcsinfo, vinfo, transforms = calc_wcs(t_pars)
             pointing_engdb_quality = f'CALCULATED_{t_pars.method.value.upper()}'
             logger.info('Setting ENGQLPTG keyword to %s', pointing_engdb_quality)
-            model.meta.visit.pointing_engdb_quality = pointing_engdb_quality
+            model.meta.visit.engdb_pointing_quality = pointing_engdb_quality
         except Exception as e:
             logger.warning(
                 'WCS calculation has failed and will be skipped.'
@@ -712,7 +712,7 @@ def update_wcs_from_telem(model, t_pars: TransformParameters):
                 raise
             else:
                 logger.info("Setting ENGQLPTG keyword to PLANNED")
-                model.meta.visit.pointing_engdb_quality = "PLANNED"
+                model.meta.visit.engdb_pointing_quality = "PLANNED"
     logger.info('Aperture WCS info: %s', wcsinfo)
     logger.info('V1 WCS info: %s', vinfo)
 

diff --git a/jwst/lib/tests/data/add_wcs_default.fits b/jwst/lib/tests/data/add_wcs_default.fits
diff --git a/jwst/lib/tests/data/add_wcs_method_full_nosiafdb.fits b/jwst/lib/tests/data/add_wcs_method_full_nosiafdb.fits
diff --git a/jwst/lib/tests/data/add_wcs_method_full_siafdb.fits b/jwst/lib/tests/data/add_wcs_method_full_siafdb.fits
diff --git a/jwst/lib/tests/data/add_wcs_method_gscmd.fits b/jwst/lib/tests/data/add_wcs_method_gscmd.fits
diff --git a/jwst/lib/tests/data/add_wcs_with_db.fits b/jwst/lib/tests/data/add_wcs_with_db.fits
diff --git a/jwst/lib/tests/data/test_from_models.ecsv b/jwst/lib/tests/data/test_from_models.ecsv
@@ -1,11 +1,19 @@
-# %ECSV 0.9
+# %ECSV 1.0
 # ---
 # datatype:
-# - {name: source, datatype: object}
+# - {name: source, datatype: string}
 # - {name: obstime, datatype: string}
 # - {name: ra, datatype: float64}
 # - {name: dec, datatype: float64}
 # - {name: pa_v3, datatype: float64}
+# meta: {allow_default: 'False', default_pa_v3: '0.0', dry_run: 'False', engdb_url: None, fsmcorr_units: '''arcsec''', fsmcorr_version: '''latest''',
+#   guide_star_wcs: 'WCSRef(ra=None, dec=None, pa=None)', j2fgs_transpose: 'True', jwst_velocity: None, method: '<Methods.TR_202105: ''tr_202105''>',
+#   override_transforms: None, pcs_mode: None, pointing: "Pointing(q=array([-0.20954683, -0.61776551, -0.44653169,  0.61242579]), j2fgs_matrix=array([-9.77287289e-04,\
+#     \  3.38988233e-03,  9.99993777e-01,  9.99999522e-01,\n        8.36530712e-09,  9.77292876e-04,  3.30454258e-06,  9.99994254e-01,\n\
+#     \       -3.38988071e-03]), fsmcorr=array([ 0.00395261, -0.00236234]), obstime=<Time object: scale='utc' format='unix' value=1611628346.205026>,\
+#     \ gs_commanded=array([-22.40031242,  -8.17869377]), fgsid=1, gs_position=array([-22.4002638,  -8.1786461]))", reduce_func: None,
+#   siaf: 'SIAF(v2_ref=0.0, v3_ref=0.0, v3yangle=0.0, vparity=1.0, crpix1=0, crpix2=0, cdelt1=3600, cdelt2=3600, vertices_idl=(0, 1, 1,
+#     0, 0, 0, 1, 1))', siaf_db: <jwst.lib.siafdb.SiafDb object at 0x7f8970d6eb80>, tolerance: '60.0', useafter: None, v3pa_at_gs: None}
 # schema: astropy-2.0
 source obstime ra dec pa_v3
-None 2021-01-26T02:32:26.205 240.63922143577395 70.70447593936892 298.0331504119865
+<ImageModel> 2021-01-26T02:32:26.205 240.63922143577395 70.70447593936892 298.0331504119865
diff --git a/jwst/lib/tests/test_set_telescope_pointing.py b/jwst/lib/tests/test_set_telescope_pointing.py
@@ -52,7 +52,8 @@
 OBSTIME_EXPECTED = STARTTIME
 
 # Meta attributes for test comparisions
-METAS_EQALITY = ['meta.pointing.ra_v1',
+METAS_EQALITY = ['meta.visit.engdb_pointing_quality',
+                 'meta.pointing.ra_v1',
                  'meta.pointing.dec_v1',
                  'meta.pointing.pa_v3',
                  'meta.wcsinfo.wcsaxes',

diff --git a/jwst/lib/v1_calculate.py b/jwst/lib/v1_calculate.py
@@ -125,10 +125,7 @@ def simplify_table(v1_table):
     formatted: astropy.table.Table
         Reformatted table.
     """
-    if v1_table['source'].dtype == object:
-        source_formatted = [v.meta.filename for v in v1_table['source']]
-    else:
-        source_formatted = v1_table['source']
+    source_formatted = [str(v) for v in v1_table['source']]
     obstime_formatted = v1_table['obstime'].isot
     ras, decs, pa_v3s = list(map(list, zip(*v1_table['v1'])))