Add includes and imports for clarity per style guide

lsst · Mar 14, 2017 · 1e75587 · 1e75587
1 parent 68eef77
commit 1e75587
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/python/lsst/jointcal/associations.cc b/python/lsst/jointcal/associations.cc
@@ -23,6 +23,7 @@
 #include "pybind11/pybind11.h"
 
 #include "lsst/jointcal/Associations.h"
+#include "lsst/jointcal/CcdImage.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -58,6 +59,7 @@ void declareAssociations(py::module &mod) {
 }
 
 PYBIND11_PLUGIN(associations) {
+    py::module::import("lsst.jointcal.ccdImage");
     py::module mod("associations");
 
     declareAssociations(mod);

diff --git a/python/lsst/jointcal/astrometryFit.cc b/python/lsst/jointcal/astrometryFit.cc
@@ -22,10 +22,10 @@
 
 #include "pybind11/pybind11.h"
 
-#include "lsst/jointcal/Chi2.h"
 #include "lsst/jointcal/Associations.h"
 #include "lsst/jointcal/AstrometryFit.h"
 #include "lsst/jointcal/AstrometryModel.h"
+#include "lsst/jointcal/Chi2.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -46,7 +46,9 @@ void declareAstrometryFit(py::module &mod) {
 }
 
 PYBIND11_PLUGIN(astrometryFit) {
-    py::module::import("lsst.jointcal.chi2"); // need this for computeChi2's return value
+    py::module::import("lsst.jointcal.associations");
+    py::module::import("lsst.jointcal.astrometryModels");
+    py::module::import("lsst.jointcal.chi2");
     py::module mod("astrometryFit");
 
     declareAstrometryFit(mod);

diff --git a/python/lsst/jointcal/astrometryModels.cc b/python/lsst/jointcal/astrometryModels.cc
@@ -26,6 +26,8 @@
 #include "lsst/jointcal/AstrometryModel.h"
 #include "lsst/jointcal/SimplePolyModel.h"
 #include "lsst/jointcal/ConstrainedPolyModel.h"
+#include "lsst/jointcal/Gtransfo.h"
+
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -55,7 +57,8 @@ void declareConstrainedPolyModel(py::module &mod) {
 }
 
 PYBIND11_PLUGIN(astrometryModels) {
-    py::module::import("lsst.jointcal.gtransfo"); // for produceSipWcs return value
+    py::module::import("lsst.jointcal.ccdImage");
+    py::module::import("lsst.jointcal.gtransfo");
     py::module mod("astrometryModels");
 
     declareAstrometryModel(mod);

diff --git a/python/lsst/jointcal/ccdImage.cc b/python/lsst/jointcal/ccdImage.cc
@@ -25,7 +25,6 @@
 
 #include <list>
 
-#include "lsst/utils/python.h"
 #include "lsst/jointcal/CcdImage.h"
 
 namespace py = pybind11;
@@ -66,13 +65,11 @@ void declareCcdImageList(py::module &mod) {
 
     cls.def("sizeValidForFit", &CcdImageList::sizeValidForFit);
 
-    // Make this behave like a std::list, which it is, but we can't wrap children of it easily.
+    // Make this behave like a std::list (which it is but we can't wrap std::list subclasses trivially)
     cls.def("__len__", &CcdImageList::size);
     cls.def("__iter__", [](const CcdImageList &self) {
         return py::make_iterator(self.begin(), self.end());
     }, py::keep_alive<0, 1>()); /* Essential: keep object alive while iterator exists */
-    // cls.def("__getitem__", [](CcdImageList const& self, std::ptrdiff_t i) {
-    //     return self[utils::python::cppIndex(self.size(), i)]; });
 }
 
 PYBIND11_PLUGIN(ccdImage) {

diff --git a/python/lsst/jointcal/gtransfo.cc b/python/lsst/jointcal/gtransfo.cc
@@ -59,7 +59,7 @@ PYBIND11_PLUGIN(gtransfo) {
     declareTanSipPix2RaDec(mod);
 
     // utility functions
-    mod.def("gtransfoToTanWcs", &gtransfoToTanWcs);
+    mod.def("gtransfoToTanWcs", &gtransfoToTanWcs); // from SipToGtransfo.h
 
     return mod.ptr();
 }

diff --git a/python/lsst/jointcal/photometryFit.cc b/python/lsst/jointcal/photometryFit.cc
@@ -46,7 +46,9 @@ void declarePhotometryFit(py::module &mod) {
 }
 
 PYBIND11_PLUGIN(photometryFit) {
-    py::module::import("lsst.jointcal.chi2"); // need this for computeChi2's return value
+    py::module::import("lsst.jointcal.associations");
+    py::module::import("lsst.jointcal.chi2");
+    py::module::import("lsst.jointcal.photometryModels");
     py::module mod("photometryFit");
 
     declarePhotometryFit(mod);

diff --git a/python/lsst/jointcal/photometryModels.cc b/python/lsst/jointcal/photometryModels.cc
@@ -47,7 +47,8 @@ void declareSimplePhotometryModel(py::module &mod) {
 }
 
 PYBIND11_PLUGIN(photometryModels) {
-    py::module::import("lsst.jointcal.point"); // needed for photomFactor's default "where"
+    py::module::import("lsst.jointcal.ccdImage");
+    py::module::import("lsst.jointcal.point");
     py::module mod("photometryModels");
 
     declarePhotometryModel(mod);

diff --git a/python/lsst/jointcal/projectionHandler.cc b/python/lsst/jointcal/projectionHandler.cc
@@ -43,6 +43,7 @@ void declareOneTPPerVisitHandler(py::module &mod) {
 }
 
 PYBIND11_PLUGIN(projectionHandler) {
+    py::module::import("lsst.jointcal.ccdImage");
     py::module mod("projectionHandler");
 
     declareProjectionHandler(mod);