Merge pull request #112 from lsst/tickets/DM-44232

DM-44232: Update CI pipeline to use MakeDirectWarp

bin/pipeline.sh

@@ -62,7 +62,7 @@ pipetask --long-log --log-level="$loglevel" qgraph \
     -c calibrate:astrometry.maxMeanDistanceArcsec=0.025 \
     -c calibrate:requireAstrometry=False \
     -c calibrate:requirePhotoCal=False \
-    -c makeWarp:select.maxPsfTraceRadiusDelta=0.2 \
+    -c makeDirectWarp:select.maxPsfTraceRadiusDelta=0.2 \
     --save-qgraph "$QGRAPH_FILE"
 
 pipetask --long-log --log-level="$loglevel" run \

tests/test_coadd_outputs.py

@@ -177,7 +177,7 @@ def test_warp_inputs(self):
             self.assertEqual(len(coadd_inputs.visits), 1)
             visit_record = coadd_inputs.visits[0]
             self.assertEqual(visit_record.getWcs(), warp.wcs)
-            self.assertEqual(visit_record.getBBox(), warp.getBBox())
+            self.assertTrue(visit_record.getBBox().contains(warp.getBBox()))
             self.assertGreater(len(coadd_inputs.ccds), 0)
 
             wcs_cat = self.butler.get(

tests/test_validate_outputs.py

@@ -197,11 +197,16 @@ def test_make_tables(self):
         self.check_pipetasks(["makeCcdVisitTable", "makeVisitTable"], 1, 1)
         self.check_datasets(["ccdVisitTable", "visitTable"], 1)
 
-    def test_make_warp(self):
-        """Test existence of warps."""
-        self.check_pipetasks(["makeWarp"], self._num_visits, self._num_visits)
+    def test_make_direct_warp(self):
+        """Test existence of direct warps."""
+        self.check_pipetasks(["makeDirectWarp"], self._num_visits, self._num_visits)
         self.check_datasets(["deepCoadd_directWarp"], self._num_visits)
 
+    def test_make_psfMatched_warp(self):
+        """Test existence of PSF-matched warps."""
+        self.check_pipetasks(["makePsfMatchedWarp"], self._num_visits, self._num_visits)
+        self.check_datasets(["deepCoadd_psfMatchedWarp"], self._num_visits)
+
     def test_assemble_coadd(self):
         """Test existence of coadds."""