Merge pull request #18 from lsst/tickets/DM-9190

DM-9190: Cleanup pybind11 remaining code

python/lsst/meas/extensions/photometryKron/SConscript

@@ -1,3 +1,3 @@
 # -*- python -*-
 from lsst.sconsUtils import scripts
-scripts.BasicSConscript.pybind11(["photometryKron"])
+scripts.BasicSConscript.pybind11(["photometryKron"], addUnderscore=False)

python/lsst/meas/extensions/photometryKron/__init__.py

@@ -20,5 +20,20 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from .kronLib import *
+from __future__ import absolute_import, division, print_function
+
+from lsst.meas.base import BasePlugin, wrapSimpleAlgorithm
+from .photometryKron import KronFluxAlgorithm, KronFluxControl, KronAperture
+
+__all__ = ["KronFluxAlgorithm", "KronFluxControl", "KronAperture", "KronFluxPlugin", "KronFluxForcedPlugin"]
+
+KronFluxPlugin, KronFluxForcedPlugin = wrapSimpleAlgorithm(
+    KronFluxAlgorithm,
+    name = "ext_photometryKron_KronFlux",
+    Control = KronFluxControl,
+    executionOrder = BasePlugin.FLUX_ORDER,
+    shouldApCorr = True,
+    needsMetadata = True,
+)
+
 from .version import *

python/lsst/meas/extensions/photometryKron/photometryKron.cc

@@ -127,18 +127,24 @@ void declareKronAperture(py::module &mod) {
     declareKronApertureTemplatedMethods<afw::image::MaskedImage<float>>(cls);
 }
 
-}  // namespace lsst::meas::extensions::<anonymous>
+}  // <anonymous>
 
-PYBIND11_PLUGIN(_photometryKron) {
-    py::module mod("_photometryKron", "Python wrapper for PhotometryKroh.h");
+PYBIND11_PLUGIN(photometryKron) {
+    py::module::import("lsst.afw.geom");
+    py::module::import("lsst.afw.image");
+    py::module::import("lsst.afw.table");
+    py::module::import("lsst.daf.base");
+
+    py::module mod("photometryKron");
 
     declareKronFluxControl(mod);
     declareKronFluxAlgorithm(mod);
     declareKronAperture(mod);
 
     return mod.ptr();
 }
-}
-}
-}
-}  // namespace lsst::meas::extensions::photometryKron
+
+}  // photometryKron
+}  // extensions
+}  // meas
+}  // lsst