DM-20566: Replace afwGeom with geom and remove py2.x support #23
Conversation
| @@ -36,8 +36,8 @@ def main(): | |||
| indexid = ids[0] | |||
|
|
|||
| idName = 'id' | |||
| X = solver.getCatalogue(ra * afwGeom.degrees, dec * afwGeom.degrees, | |||
| radius * afwGeom.degrees, '', idName, indexid) | |||
| X = solver.getCatalogue(ra * geom.degrees, dec * geom.degrees, | |||
There was a problem hiding this comment.
You might also remove the spaces around the * operators, but I recognize that that would make the style inconsistent with the rest of the file.
| @@ -300,7 +300,7 @@ def _getImageParams(self, exposure=None, bbox=None, wcs=None, filterName=None, w | |||
| """Get image parameters | |||
|
|
|||
| @param[in] exposure exposure (an afwImage.Exposure) or None | |||
| @param[in] bbox bounding box (an afwGeom.Box2I) or None; if None then bbox must be specified | |||
| @param[in] bbox bounding box (an geom.Box2I) or None; if None then bbox must be specified | |||
There was a problem hiding this comment.
Should this be lsst.geom.Box2I?
There was a problem hiding this comment.
Yes, but since (1) these docstrings all need fixing up when they are converted to numpydoc and (2) they already do it wrong by using afwImage in the line above, I think I'm better off not fixing these on this pass.
There was a problem hiding this comment.
Not a problem. Leave these as they are, then.
| @@ -435,7 +435,7 @@ def determineWcs(self, sourceCat, exposure, **kwargs): | |||
| controls whether we do that or force Astrometry.net to | |||
| search both parities. Default from config.useWcsParity. | |||
|
|
|||
| 'pixelScale': afwGeom.Angle, estimate of the angle-per-pixel | |||
| 'pixelScale': geom.Angle, estimate of the angle-per-pixel | |||
There was a problem hiding this comment.
Should this be lsst.geom.Angle?
| @@ -456,7 +456,7 @@ def determineWcs(self, sourceCat, exposure, **kwargs): | |||
|
|
|||
| margs = kwargs.copy() | |||
| if 'searchRadius' not in margs: | |||
| margs.update(searchRadius=self.config.raDecSearchRadius * afwGeom.degrees) | |||
| margs.update(searchRadius=self.config.raDecSearchRadius * geom.degrees) | |||
There was a problem hiding this comment.
Consider removing whitespace around the operator.
| return pipeBase.Struct( | ||
| distMean=distMean, | ||
| distStdDev=distStdDev, | ||
| maxMatchDist=distMean + self.config.matchDistanceSigma*distStdDev, | ||
| ) | ||
|
|
||
| def _getMatchList(self, sourceCat, refCat, wcs): | ||
| dist = self.config.catalogMatchDist * afwGeom.arcseconds | ||
| dist = self.config.catalogMatchDist * geom.arcseconds |
There was a problem hiding this comment.
Consider removing whitespace around the operator.
| @@ -86,7 +86,7 @@ def loadSkyCircle(self, ctrCoord, radius, filterName=None, epoch=None, centroids | |||
| """!Load reference objects that overlap a circular sky region | |||
|
|
|||
| @param[in] ctrCoord center of search region (an afwGeom.Coord) | |||
| @param[in] radius radius of search region (an afwGeom.Angle) | |||
| @param[in] radius radius of search region (an geom.Angle) | |||
| @@ -188,7 +188,7 @@ def _getMIndexesWithinRange(self, ctrCoord, radius): | |||
| """!Get list of muti-index objects within range | |||
|
|
|||
| @param[in] ctrCoord center of search region (an afwGeom.Coord) | |||
| @param[in] radius radius of search region (an afwGeom.Angle) | |||
| @param[in] radius radius of search region (an geom.Angle) | |||
|
Thanks, I think I'd like to avoid going in and "fixing" all the |
|
Yes, don't bother changing the whitespace around the * operators on this ticket. |
No description provided.