Merge branch 'tickets/DM-2201'

lsst · Apr 11, 2015 · 55e9673 · 55e9673
2 parents b73914c + 70bde40
commit 55e9673
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/python/lsst/meas/extensions/shapeHSM/hsmLib.i b/python/lsst/meas/extensions/shapeHSM/hsmLib.i
@@ -43,10 +43,10 @@ Various swigged-up C++ classes for testing
 #include "lsst/afw/geom/ellipses.h"
 #include "lsst/meas/algorithms.h"
 #include "lsst/meas/base.h"
-#include "lsst/meas/base/Algorithm.h"
 %}
 
 %include "lsst/p_lsstSwig.i"
+%initializeNumPy(meas_extensions_shapeHSM)
 %include "lsst/pex/config.h"            // LSST_CONTROL_FIELD.
 
 %lsst_exceptions()
@@ -55,8 +55,7 @@ Various swigged-up C++ classes for testing
 %import "lsst/afw/geom/geomLib.i"
 %import "lsst/afw/geom/ellipses/ellipsesLib.i"
 
-%include "lsst/meas/base/exceptions.i"
-%include "lsst/meas/base/Algorithm.h"
+%import "lsst/meas/base/baseLib.i"
 
 %{
 #include "lsst/meas/extensions/shapeHSM/HsmShapeControl.h"