DM-20566: Replace afwGeom with geom #128
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timj
force-pushed
the
tickets/DM-20566-ip_diffim
branch
from
cbc1571
to
404e25f
Compare
timj
force-pushed
the
tickets/DM-20566-ip_diffim
branch
from
404e25f
to
c34c92c
Compare
isullivan
approved these changes
Jul 18, 2019
examples/spatialKernel.cc
Outdated
| #include "lsst/afw/geom.h" | ||
| #include <cmath> | ||
|
|
||
| #include "lsst/geom.h" |
There was a problem hiding this comment.
Very minor point, but shouldn't this include go after the afw ones?
| @@ -13,14 +13,15 @@ | |||
| #define LSST_IP_DIFFIM_BUILDSPATIALKERNELVISITOR_H | |||
|
|
|||
| #include "Eigen/Core" | |||
| #include "lsst/geom.h" | |||
There was a problem hiding this comment.
Move this to after the afw includes?
| @@ -16,15 +16,15 @@ | |||
| #include "Eigen/Core" | |||
|
|
|||
| #include "lsst/afw/math.h" | |||
| #include "lsst/afw/geom.h" | |||
| #include "lsst/geom.h" | |||
There was a problem hiding this comment.
Move to after the afw include?
python/lsst/ip/diffim/dcrModel.py
Outdated
| @@ -23,7 +23,7 @@ | |||
| import numpy as np | |||
| from scipy import ndimage | |||
| from lsst.afw.coord.refraction import differentialRefraction | |||
| import lsst.afw.geom as afwGeom | |||
| import lsst.geom as geom | |||
There was a problem hiding this comment.
Move to after the afw import?
python/lsst/ip/diffim/diffimTools.py
Outdated
| @@ -31,6 +31,7 @@ | |||
| from . import diffimLib | |||
|
|
|||
| # all the other LSST packages | |||
| import lsst.geom as geom | |||
There was a problem hiding this comment.
Move to after the afw imports?
| @@ -23,7 +23,7 @@ | |||
| import numpy as np | |||
| import warnings | |||
|
|
|||
| import lsst.afw.geom as afwGeom | |||
| import lsst.geom as geom | |||
There was a problem hiding this comment.
Move to after the afw import?
| @@ -21,7 +21,7 @@ | |||
|
|
|||
| import numpy as np | |||
|
|
|||
| import lsst.afw.geom as afwGeom | |||
| import lsst.geom as geom | |||
There was a problem hiding this comment.
Move to after the afw import?
| @@ -787,7 +787,7 @@ def _plotBoxGrid(self, boxes, bbox, **kwargs): | |||
| Parameters | |||
| ---------- | |||
| boxes : `list` | |||
| a list of `afwGeom.BoundingBox`es | |||
| a list of `lsst.afw.geom.BoundingBox`es | |||
There was a problem hiding this comment.
Shouldn't this be lsst.geom.BoundingBox ?
There was a problem hiding this comment.
I was meant to change to to lsst.geom.Box2I.
lsst.afw.geom.BoundingBox is not a valid class.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.