Merge pull request #19 from lsst/tickets/DM-14725

DM-14725: Eliminate explicit use of ndarray::EigenView in C++ code
lsst · Jun 8, 2018 · 915046d · 915046d
2 parents e6e5c2d + f253b77
commit 915046d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/ConversionMatrix.cc b/src/ConversionMatrix.cc
@@ -190,7 +190,7 @@ void ConversionMatrix::multiplyOnLeft(
     } else {
         i = ConversionSingleton::get().getL2H().begin();
     }
-    ndarray::EigenView<double,1,0> vector(array);
+    auto vector = array.asEigen();
     for (int offset = 0; offset < vector.size(); ++i) {
         vector.segment(offset, i->rows()).transpose() *= i->transpose();
         offset += i->rows();
@@ -214,7 +214,7 @@ void ConversionMatrix::multiplyOnRight(
     } else {
         i = ConversionSingleton::get().getL2H().begin();
     }
-    ndarray::EigenView<double,1,0> vector(array);
+    auto vector = array.asEigen();
     for (int offset = 0; offset < vector.size(); ++i) {
         vector.segment(offset, i->rows()).transpose() *= (*i);
         offset += i->rows();

diff --git a/src/GaussHermiteConvolution.cc b/src/GaussHermiteConvolution.cc
@@ -237,8 +237,8 @@ ImplN::ImplN(
 ndarray::Array<double const,2,2> ImplN::evaluate(
     afw::geom::ellipses::Ellipse & ellipse
 ) const {
-    ndarray::EigenView<double,2,2> result(_result);
-    ndarray::EigenView<double const,1,1> psf_coeff(_psf.getCoefficients());
+    auto result = _result.asEigen();
+    auto psf_coeff = _psf.getCoefficients().asEigen();
 
     Eigen::Matrix2d psfT = _psf.getEllipse().getCore().getGridTransform().invert().getMatrix();
     Eigen::Matrix2d modelT = ellipse.getCore().getGridTransform().invert().getMatrix();

diff --git a/src/MatrixBuilder.cc b/src/MatrixBuilder.cc
@@ -859,7 +859,7 @@ namespace {
 // helper function for the next two ctors: test if a MultiShapeletBasisComponent has unit scaling
 // and identity remap matrix
 bool isSimple(MultiShapeletBasisComponent const & component) {
-    ndarray::EigenView<double const,2,2> matrix(component.getMatrix());
+    auto matrix = component.getMatrix().asEigen();
     return std::abs(component.getRadius() - 1.0) < std::numeric_limits<double>::epsilon() &&
         matrix.rows() == matrix.cols() &&
         matrix.isApprox(

diff --git a/src/ShapeletFunction.cc b/src/ShapeletFunction.cc
@@ -169,7 +169,7 @@ ShapeletFunctionEvaluator::ShapeletFunctionEvaluator(
 ShapeletFunction ShapeletFunction::convolve(ShapeletFunction const & other) const {
     GaussHermiteConvolution convolution(getOrder(), other);
     afw::geom::ellipses::Ellipse newEllipse(_ellipse);
-    ndarray::EigenView<double const,2,2> matrix(convolution.evaluate(newEllipse));
+    auto matrix = convolution.evaluate(newEllipse).asEigen();
     if (_basisType == LAGUERRE) {
         ConversionMatrix::convertCoefficientVector(_coefficients, LAGUERRE, HERMITE, getOrder());
     }