Stop using Detector.transform

and update for Detector.getCenter returning a Point2D isntead of a CameraPoint
lsst-dm · Feb 25, 2018 · eda09ef · eda09ef
1 parent 96763ef
commit eda09ef
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/shimCameraGeom.cc b/src/shimCameraGeom.cc
@@ -33,11 +33,11 @@ afw::geom::LinearTransform makeScalingMmToPx(afw::geom::Extent2D const pSize) {
 
 afw::geom::Point2D getCenterInFpPixels(CONST_PTR(afw::cameraGeom::Detector) det) {
     auto scaling = makeScalingMmToPx(det->getPixelSize());
-    return scaling(det->getCenter(afw::cameraGeom::FOCAL_PLANE).getPoint());
+    return scaling(det->getCenter(afw::cameraGeom::FOCAL_PLANE));
 }
 
 afw::geom::Point2D getCenterInDetectorPixels(CONST_PTR(afw::cameraGeom::Detector) det) {
-    auto center = det->getCenter(afw::cameraGeom::PIXELS).getPoint();
+    auto center = det->getCenter(afw::cameraGeom::PIXELS);
     if ((getNQuarter(det)%2) != 0) {
         return afw::geom::Point2D(center.getY(), center.getX());
     } else {
@@ -54,11 +54,9 @@ int getHeight(CONST_PTR(afw::cameraGeom::Detector) det) {
 }
 
 afw::geom::Point2D detPxToFpPx(CONST_PTR(afw::cameraGeom::Detector) det, afw::geom::Point2D const detPt) {
-    afw::geom::Point2D point;
-    point = detPt;
     auto scaling = makeScalingMmToPx(det->getPixelSize());
-    return scaling(det->transform(det->makeCameraPoint(point, afw::cameraGeom::PIXELS),
-                                  afw::cameraGeom::FOCAL_PLANE).getPoint());
+    auto pixelsToFocalPlane = det->getTransform(afw::cameraGeom::PIXELS, afw::cameraGeom::FOCAL_PLANE);
+    return scaling(pixelsToFocalPlane.applyForward(detPt));
 }
 
 afw::geom::Point2D detPxToFpPxRot(CONST_PTR(afw::cameraGeom::Detector) det, afw::geom::Point2D const detPt) {