Merge pull request #185 from lsst/tickets/DM-39796

DM-39796: Update task config defaults to LSST values
lsst · Sep 21, 2023 · 0d499ea · 0d499ea
2 parents f36cf20 + 29fd858
commit 0d499ea
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/include/lsst/meas/astrom/matchOptimisticB.h b/include/lsst/meas/astrom/matchOptimisticB.h
@@ -88,7 +88,7 @@ struct MatchOptimisticBControl {
     MatchOptimisticBControl()
             : refFluxField("r_flux"),
               sourceFluxField("slot_ApFlux_instFlux"),
-              numBrightStars(100),
+              numBrightStars(150),
               minMatchedPairs(50),
               matchingAllowancePix(10.0),
               maxOffsetPix(300),

diff --git a/python/lsst/meas/astrom/astrometry.py b/python/lsst/meas/astrom/astrometry.py
@@ -75,7 +75,7 @@ class AstrometryConfig(RefMatchConfig):
         dtype=bool,
         doc=("If True then a rough zeropoint will be computed from matched sources "
              "and outliers will be rejected in the iterations."),
-        default=False,
+        default=True,
     )
     magnitudeOutlierRejectionNSigma = pexConfig.Field(
         dtype=float,

diff --git a/python/lsst/meas/astrom/fitTanSipWcs.py b/python/lsst/meas/astrom/fitTanSipWcs.py
@@ -137,7 +137,7 @@ def fitWcs(self, matches, initWcs, bbox=None, refCat=None, sourceCat=None, expos
             if rejected.sum() == len(rejected):
                 raise RuntimeError("All matches rejected in iteration %d" % (rej + 1,))
             self.log.debug(
-                "Iteration %d of astrometry fitting: rejected %f outliers, out of %d total matches.",
+                "Iteration %d of astrometry fitting: rejected %d outliers, out of %d total matches.",
                 rej, rejected.sum(), len(rejected)
             )
             if debug.plot:

diff --git a/python/lsst/meas/astrom/matchOptimisticBTask.py b/python/lsst/meas/astrom/matchOptimisticBTask.py
@@ -41,9 +41,9 @@ class MatchOptimisticBConfig(pexConfig.Config):
         min=0,
     )
     numBrightStars = pexConfig.RangeField(
-        doc="Number of bright stars to use",
+        doc="Maximum number of bright stars to use in fit.",
         dtype=int,
-        default=50,
+        default=150,
         min=2,
     )
     minMatchedPairs = pexConfig.RangeField(

diff --git a/python/lsst/meas/astrom/matchPessimisticB.py b/python/lsst/meas/astrom/matchPessimisticB.py
@@ -82,10 +82,10 @@ class MatchPessimisticBConfig(pexConfig.Config):
     """Configuration for MatchPessimisticBTask
     """
     numBrightStars = pexConfig.RangeField(
-        doc="Number of bright stars to use. Sets the max number of patterns "
+        doc="Maximum number of bright stars to use. Sets the max number of patterns "
             "that can be tested.",
         dtype=int,
-        default=200,
+        default=150,
         min=2,
     )
     minMatchedPairs = pexConfig.RangeField(

diff --git a/tests/test_astrometryTask.py b/tests/test_astrometryTask.py
@@ -142,6 +142,8 @@ def doTest(self, pixelsToTanPixels, order=3):
         config = AstrometryTask.ConfigClass()
         config.wcsFitter.order = order
         config.wcsFitter.numRejIter = 0
+        # This test is from before rough magnitude rejection was implemented.
+        config.doMagnitudeOutlierRejection = False
         solver = AstrometryTask(config=config, refObjLoader=self.refObjLoader)
         results = solver.run(
             sourceCat=sourceCat,