Merge pull request #120 from lsst/tickets/DM-14834

DM-14834: Use pybind11's native Eigen wrapping instead of ndarray EigenView
lsst · Jun 29, 2018 · c13a37e · c13a37e
2 parents 0fc3614 + 50ef7e0
commit c13a37e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/python/lsst/meas/base/centroidUtilities.cc b/python/lsst/meas/base/centroidUtilities.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 
 #include <memory>
 

diff --git a/python/lsst/meas/base/shapeUtilities.cc b/python/lsst/meas/base/shapeUtilities.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 
 #include <memory>
 

diff --git a/src/ApertureFlux.cc b/src/ApertureFlux.cc
@@ -147,9 +147,8 @@ ApertureFluxAlgorithm::Result ApertureFluxAlgorithm::computeSincFlux(
     CONST_PTR(afw::image::Image<T>) cImage = getSincCoeffs<T>(image.getBBox(), ellipse, result, ctrl);
     if (result.getFlag(APERTURE_TRUNCATED.number)) return result;
     afw::image::Image<T> subImage(image, cImage->getBBox());
-    result.flux = (subImage.getArray().template asEigen<Eigen::ArrayXpr>() *
-                   cImage->getArray().template asEigen<Eigen::ArrayXpr>())
-                          .sum();
+    result.flux =
+            (ndarray::asEigenArray(subImage.getArray()) * ndarray::asEigenArray(cImage->getArray())).sum();
     return result;
 }
 
@@ -161,13 +160,13 @@ ApertureFluxAlgorithm::Result ApertureFluxAlgorithm::computeSincFlux(
     CONST_PTR(afw::image::Image<T>) cImage = getSincCoeffs<T>(image.getBBox(), ellipse, result, ctrl);
     if (result.getFlag(APERTURE_TRUNCATED.number)) return result;
     afw::image::MaskedImage<T> subImage(image, cImage->getBBox(afw::image::PARENT), afw::image::PARENT);
-    result.flux = (subImage.getImage()->getArray().template asEigen<Eigen::ArrayXpr>() *
-                   cImage->getArray().template asEigen<Eigen::ArrayXpr>())
+    result.flux = (ndarray::asEigenArray(subImage.getImage()->getArray()) *
+                   ndarray::asEigenArray(cImage->getArray()))
                           .sum();
-    result.fluxSigma = std::sqrt(
-            (subImage.getVariance()->getArray().template asEigen<Eigen::ArrayXpr>().template cast<T>() *
-             cImage->getArray().template asEigen<Eigen::ArrayXpr>().square())
-                    .sum());
+    result.fluxSigma =
+            std::sqrt((ndarray::asEigenArray(subImage.getVariance()->getArray()).template cast<T>() *
+                       ndarray::asEigenArray(cImage->getArray()).square())
+                              .sum());
     return result;
 }