wcs->jointcal_wcs and photoCalib->jointcal_photoCalib

jointcal_wcs is no longer stored in an empty Exposure!

bin.src/plot_photoCalib.py

@@ -29,7 +29,7 @@
 matplotlib.rcParams['figure.dpi'] = 300
 
 
-def getValidDataIds(butler, tract, dataset_type='photoCalib'):
+def getValidDataIds(butler, tract, dataset_type='jointcal_photoCalib'):
     """Return a list of all dataIds that exist in this butler.
 
     This exists here because the butler doesn't provide this functionality.
@@ -125,7 +125,7 @@ def makePhotoCalibImages(visit, butler, step=8, chips=[], tract=None,
             if verbose:
                 print('calib ccd %s: %s' % (ccd, calibScaling))
 
-        photoCalib = butler.get('photoCalib', dataId=dict(visit=int(visit), ccd=int(ccd), tract=0))
+        photoCalib = butler.get('jointcal_photoCalib', dataId=dict(visit=int(visit), ccd=int(ccd), tract=0))
         if verbose:
             print("photoCalib mean ccd %s: %s" % (ccd, photoCalib.getCalibrationMean()))
         scaled = photoCalib.computeScaledCalibration()
@@ -243,7 +243,7 @@ def main():
     parser = argparse.ArgumentParser(description=__doc__,
                                      formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument("repo", metavar="repo",
-                        help="Directory to butler repository containing `photoCalib` datasets.")
+                        help="Directory to butler repository containing `jointcal_photoCalib` datasets.")
     parser.add_argument("--step", default=8, type=int,
                         help="Steps between samples per image (i.e. larger number = coarser image).")
     parser.add_argument("--tract", default=0, type=int,

python/lsst/jointcal/jointcal.py

@@ -673,7 +673,7 @@ def _iterate_fit(self, fit, model, max_steps, name, whatToFit):
 
     def _write_astrometry_results(self, associations, model, visit_ccd_to_dataRef):
         """
-        Write the fitted astrometric results to a new 'wcs' dataRef.
+        Write the fitted astrometric results to a new 'jointcal_wcs' dataRef.
 
         Parameters
         ----------
@@ -691,20 +691,18 @@ def _write_astrometry_results(self, associations, model, visit_ccd_to_dataRef):
             ccd = ccdImage.ccdId
             visit = ccdImage.visit
             dataRef = visit_ccd_to_dataRef[(visit, ccd)]
-            exp = afwImage.ExposureI(0, 0)
             self.log.info("Updating WCS for visit: %d, ccd: %d", visit, ccd)
             tanSip = model.produceSipWcs(ccdImage)
-            tanWcs = lsst.jointcal.gtransfoToTanWcs(tanSip, ccdImage.imageFrame, False)
-            exp.setWcs(tanWcs)
+            wcs = lsst.jointcal.gtransfoToTanWcs(tanSip, ccdImage.imageFrame, False)
             try:
-                dataRef.put(exp, 'wcs')
+                dataRef.put(wcs, 'jointcal_wcs')
             except pexExceptions.Exception as e:
                 self.log.fatal('Failed to write updated Wcs: %s', str(e))
                 raise e
 
     def _write_photometry_results(self, associations, model, visit_ccd_to_dataRef):
         """
-        Write the fitted photometric results to a new 'photoCalib' dataRef.
+        Write the fitted photometric results to a new 'jointcal_photoCalib' dataRef.
 
         Parameters
         ----------
@@ -725,7 +723,7 @@ def _write_photometry_results(self, associations, model, visit_ccd_to_dataRef):
             self.log.info("Updating PhotoCalib for visit: %d, ccd: %d", visit, ccd)
             photoCalib = model.toPhotoCalib(ccdImage)
             try:
-                dataRef.put(photoCalib, 'photoCalib')
+                dataRef.put(photoCalib, 'jointcal_photoCalib')
             except pexExceptions.Exception as e:
                 self.log.fatal('Failed to write updated PhotoCalib: %s', str(e))
                 raise e

python/lsst/jointcal/jointcalCoadd.py

@@ -52,7 +52,7 @@ def applyJointcalResultsExposure(self, dataRef, calexp=None):
         if calexp is None:
             calexp = dataRef.get("calexp")
 
-        wcsCont = dataRef.get("wcs")
-        calexp.setWcs(wcsCont.getWcs())
+        wcsCont = dataRef.get("jointcal_wcs")
+        calexp.setWcs(wcsCont)
 
         return Struct(exposure=calexp)

python/lsst/jointcal/utils.py

@@ -128,14 +128,14 @@ def compute(catalogs, photoCalibs):
         new_cats = [ref.get('src') for ref in data_refs]
         new_wcss = []
         if self.do_astrometry:
-            new_wcss = [ref.get('wcs') for ref in data_refs]
+            new_wcss = [ref.get('jointcal_wcs') for ref in data_refs]
         new_calibs = []
         if self.do_photometry:
-            new_calibs = [ref.get('photoCalib') for ref in data_refs]
+            new_calibs = [ref.get('jointcal_photoCalib') for ref in data_refs]
         if self.do_astrometry:
             for wcs, cat in zip(new_wcss, new_cats):
                 # update in-place the object coordinates based on the new wcs
-                lsst.afw.table.updateSourceCoords(wcs.getWcs(), cat)
+                lsst.afw.table.updateSourceCoords(wcs, cat)
 
         self.new_dist, self.new_flux, self.new_ref_flux, self.new_source = compute(new_cats, new_calibs)
 
@@ -499,7 +499,7 @@ def plot_all_wcs_deltas(plt, data_refs, visits, old_wcs_list, per_ccd_plot=False
         for i, ref in enumerate(data_refs):
             md = ref.get('calexp_md')
             dims = lsst.afw.image.bboxFromMetadata(md).getDimensions()
-            plot_wcs(plt, old_wcs_list[i], ref.get('wcs').getWcs(),
+            plot_wcs(plt, old_wcs_list[i], ref.get('jointcal_wcs'),
                      dims.getX(), dims.getY(),
                      center=(md.get('CRVAL1'), md.get('CRVAL2')), name='dataRef %d'%i,
                      outdir=outdir)
@@ -555,7 +555,7 @@ def plot_all_wcs_quivers(plt, data_refs, visits, old_wcs_list, name, outdir='.pl
                 continue
             md = ref.get('calexp_md')
             dims = lsst.afw.image.bboxFromMetadata(md).getDimensions()
-            Q = plot_wcs_quivers(ax, old_wcs, ref.get('wcs').getWcs(),
+            Q = plot_wcs_quivers(ax, old_wcs, ref.get('jointcal_wcs'),
                                  dims.getX(), dims.getY())
             # TODO: add CCD bounding boxes to plot once DM-5503 is finished.
             # TODO: add a circle for the full focal plane.
@@ -625,7 +625,7 @@ def plot_wcs_magnitude(plt, data_refs, visits, old_wcs_list, name, outdir='.plot
             md = ref.get('calexp_md')
             dims = lsst.afw.image.bboxFromMetadata(md).getDimensions()
             x1, y1, x2, y2 = make_xy_wcs_grid(dims.getX(), dims.getY(),
-                                              old_wcs, ref.get('wcs').getWcs())
+                                              old_wcs, ref.get('jointcal_wcs'))
             uu = x2 - x1
             vv = y2 - y1
             extent = (x1[0, 0], x1[-1, -1], y1[0, 0], y1[-1, -1])

tests/test_jointcal_hsc.py

@@ -136,7 +136,7 @@ def testJointcalTask_2_visits_no_astrometry(self):
 
         for data_ref in data_refs:
             with self.assertRaises(lsst.daf.persistence.butlerExceptions.NoResults):
-                data_ref.get('wcs').getWcs()
+                data_ref.get('jointcal_wcs')
 
     def testJointcalTask_2_visits_no_photometry(self):
         """Test turning off fitting photometry."""
@@ -169,9 +169,8 @@ def testJointcalTask_2_visits_no_photometry(self):
         self.assertIsNone(rms_result.pa1)
 
         for data_ref in data_refs:
-            calib = data_ref.get('wcs').getCalib()
-            blank_calib = lsst.afw.image.Calib()
-            self.assertEqual(calib, blank_calib)
+            with self.assertRaises(lsst.daf.persistence.butlerExceptions.NoResults):
+                data_ref.get('jointcal_photoCalib')
 
     def test_jointcalTask_2_visits_gaia_refcat(self):
         self.config = lsst.jointcal.jointcal.JointcalConfig()

tests/test_jointcal_lsstSim.py

@@ -159,8 +159,8 @@ def testJointcalTask_2_visits_no_astrometry(self):
         self.assertLess(rms_result.pa1, pa1)
 
         for data_ref in data_refs:
-            wcs = data_ref.get('wcs').getWcs()
-            self.assertIsNone(wcs)
+            with self.assertRaises(lsst.daf.persistence.butlerExceptions.NoResults):
+                data_ref.get('jointcal_wcs')
 
     def testJointcalTask_2_visits_no_photometry(self):
         """Test turning off fitting photometry."""
@@ -193,9 +193,8 @@ def testJointcalTask_2_visits_no_photometry(self):
         self.assertIsNone(rms_result.pa1)
 
         for data_ref in data_refs:
-            calib = data_ref.get('wcs').getCalib()
-            blank_calib = lsst.afw.image.Calib()
-            self.assertEqual(calib, blank_calib)
+            with self.assertRaises(lsst.daf.persistence.butlerExceptions.NoResults):
+                data_ref.get('jointcal_photoCalib')
 
 
 class MemoryTester(lsst.utils.tests.MemoryTestCase):