diff --git a/bin/pipeline.sh b/bin/pipeline.sh index 2930e2a..84a7797 100755 --- a/bin/pipeline.sh +++ b/bin/pipeline.sh @@ -53,12 +53,14 @@ HIPS_QGRAPH_FILE=$(mktemp)_hips.qgraph trap 'rm -f $QGRAPH_FILE $INJECTION_QGRAPH_FILE $RESOURCE_USAGE_QGRAPH_FILE \ $HIPS_QGRAPH_FILE' EXIT +# DM-46272: Change maxMeanDistanceArcsec to something smaller, so that it fails; +# even better, move those settings into DRP-ci_hsc.yaml! pipetask --long-log --log-level="$loglevel" qgraph \ -d "skymap='discrete/ci_hsc' AND tract=0 AND patch=69" \ -b "$repo"/butler.yaml \ --input "$INPUTCOLL" --output "$COLLECTION" \ -p "$DRP_PIPE_DIR/pipelines/HSC/DRP-ci_hsc.yaml" \ - -c calibrateImage:astrometry.maxMeanDistanceArcsec=0.020 \ + -c calibrateImage:astrometry.maxMeanDistanceArcsec=0.20 \ -c makeWarp:select.maxPsfTraceRadiusDelta=0.2 \ --save-qgraph "$QGRAPH_FILE" diff --git a/python/lsst/ci/hsc/gen3/data.py b/python/lsst/ci/hsc/gen3/data.py index 07f354a..2cbf922 100644 --- a/python/lsst/ci/hsc/gen3/data.py +++ b/python/lsst/ci/hsc/gen3/data.py @@ -58,8 +58,10 @@ # set. This list is sensitive to the astrometry algorithms and dataset # under consideration, so may require updating if either of those change # in the context of this repository. +# DM-46272: not forcing these failures until we can handle partial outputs; +# uncomment this line as that ticket is sorted out. ASTROMETRY_FAILURE_DATA_IDS = [ - {'visit': 903344, 'detector': 0, 'physical_filter': 'HSC-R'}, + # {'visit': 903344, 'detector': 0, 'physical_filter': 'HSC-R'}, ] # The following lists the dataIds that fail the PSF Model robustness check # with the config override makeWarp.select.maxPsfTraceRadiusDelta=0.2 set. diff --git a/tests/test_astrometryFail.py b/tests/test_astrometryFail.py index e8f6204..54f7d0b 100644 --- a/tests/test_astrometryFail.py +++ b/tests/test_astrometryFail.py @@ -29,6 +29,8 @@ from lsst.utils import getPackageDir +# DM-46272: not forcing these failures until we can handle partial outputs; +# remove the expectedFailures as that ticket is sorted out. class TestAstrometryFails(lsst.utils.tests.TestCase): """Tests the outputs of the forced astrometry failures. """ @@ -45,6 +47,7 @@ def setUp(self): universe=self.butler.dimensions, ) + @unittest.expectedFailure def testWcsAndPhotoCalibIsNoneForFailedAstrom(self): """Test the WCS and photoCalib objects attached to failed WCS exposure. @@ -61,6 +64,7 @@ def testWcsAndPhotoCalibIsNoneForFailedAstrom(self): calexpPhotoCalib = self.butler.get("calexp.photoCalib", self.calexpMinimalDataId) self.assertTrue(calexpPhotoCalib is None) + @unittest.expectedFailure def testSrcCoordsAreNanForFailedAstrom(self): """Test coord values in all source catalogs. @@ -99,6 +103,7 @@ def testCentroidsAreNotNanForFailedAstrom(self): self.assertFalse(np.all(np.isnan(sourceCat["x"]))) self.assertFalse(np.all(np.isnan(sourceCat["y"]))) + @unittest.expectedFailure def testVisitCoordsAreNanForFailedAstrom(self): """Test coord and astrom values for visitTable and visitSummary.