Skip to content

Commit

Permalink
AstrometryTask: remove grow by maxOffsetPix
Browse files Browse the repository at this point in the history
This grow is already performed by the reference catalog loader, but it
is controlled by the refObjLoader.pixelMargin parameter. That parameter
now matches maxOffsetPix. Added a note to maxOffsetPix that the pixelMargin
should be coordinated.
  • Loading branch information
PaulPrice committed Sep 5, 2017
1 parent 05501bc commit 13f80ab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 1 addition & 4 deletions python/lsst/meas/astrom/astrometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,9 @@ def solve(self, exposure, sourceCat):
debug = lsstDebug.Info(__name__)

expMd = self._getExposureMetadata(exposure)
exp_bbox = expMd.bbox
exp_bbox.grow(afwGeom.Extent2I(self.config.matcher.maxOffsetPix,
self.config.matcher.maxOffsetPix))

loadRes = self.refObjLoader.loadPixelBox(
bbox=exp_bbox,
bbox=expMd.bbox,
wcs=expMd.wcs,
filterName=expMd.filterName,
calib=expMd.calib,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ class MatchOptimisticBConfig(pexConfig.Config):
max=1,
)
maxOffsetPix = pexConfig.RangeField(
doc="Maximum allowed shift of WCS, due to matching (pixel)",
doc="Maximum allowed shift of WCS, due to matching (pixel). "
"When changing this value, the LoadReferenceObjectsConfig.pixelMargin should also be updated.",
dtype=int,
default=300,
max=4000,
Expand Down
3 changes: 2 additions & 1 deletion python/lsst/meas/astrom/matchPessimisticB.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ class MatchPessimisticBConfig(pexConfig.Config):
min=1,
)
maxOffsetPix = pexConfig.RangeField(
doc="Maximum allowed shift of WCS, due to matching (pixel).",
doc="Maximum allowed shift of WCS, due to matching (pixel). "
"When changing this value, the LoadReferenceObjectsConfig.pixelMargin should also be updated.",
dtype=int,
default=300,
max=4000,
Expand Down

0 comments on commit 13f80ab

Please sign in to comment.