Cleanup pybind11

lsst · Apr 6, 2017 · d2c8f16 · d2c8f16
1 parent 552d3b8
commit d2c8f16
Show file tree

Hide file tree

Showing 29 changed files with 47 additions and 46 deletions.
diff --git a/bin.src/genDefectFits.py b/bin.src/genDefectFits.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import sys
 import os.path
 import re

diff --git a/bin.src/genDefectRegistry.py b/bin.src/genDefectRegistry.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 import glob
 import os

diff --git a/bin.src/makeGeom.py b/bin.src/makeGeom.py
@@ -21,7 +21,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import map
 from builtins import range
 import pyfits

diff --git a/bin.src/refileFocus.py b/bin.src/refileFocus.py
@@ -12,7 +12,7 @@
     108		110
     114		108
 """
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 
 import glob
 import os

diff --git a/bin.src/registryInfo.py b/bin.src/registryInfo.py
@@ -21,7 +21,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import argparse
 import os
 import sys

diff --git a/bin.src/showCamera.py b/bin.src/showCamera.py
@@ -21,7 +21,7 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import input
 from builtins import zip
 import numpy

diff --git a/bin.src/showDither.py b/bin.src/showDither.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import input
 from builtins import range

diff --git a/bin.src/showPsfs.py b/bin.src/showPsfs.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import range
 import argparse

diff --git a/config/cmodel.py b/config/cmodel.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 # Enable CModel mags (unsetup meas_modelfit to disable)
 # 'config' is a SourceMeasurementConfig.
 import os

diff --git a/config/hsm.py b/config/hsm.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 # Enable HSM shapes (unsetup meas_extensions_shapeHSM to disable)
 # 'config' is a SourceMeasurementConfig.
 import os.path

diff --git a/config/kron.py b/config/kron.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 # Enable Kron mags
 # 'config' is a SourceMeasurementConfig
 

diff --git a/config/processCcd.py b/config/processCcd.py
@@ -1,7 +1,7 @@
 """
 Subaru-specific overrides for ProcessCcdTask (applied before SuprimeCam- and HSC-specific overrides).
 """
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import os.path
 
 from lsst.utils import getPackageDir

diff --git a/python/lsst/obs/hsc/makeHscRawVisitInfo.py b/python/lsst/obs/hsc/makeHscRawVisitInfo.py
@@ -19,9 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 
 import astropy.units
 

diff --git a/python/lsst/obs/hsc/transformRegistry.py b/python/lsst/obs/hsc/transformRegistry.py
@@ -1,6 +1,6 @@
 from lsst.afw.geom import xyTransformRegistry, arcseconds
 from lsst.pex.config import Config, Field, ListField
-from lsst.obs.subaru.subaruLib import HscDistortion, DistortionPolynomial
+from lsst.obs.subaru import HscDistortion, DistortionPolynomial
 __all__ = ["xyTransformRegistry"]
 
 

diff --git a/python/lsst/obs/hscSim/__init__.py b/python/lsst/obs/hscSim/__init__.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from .deprecated import deprecated
 deprecated("lsst.obs.hscSim", "lsst.obs.hsc")
 from .hscSimMapper import *
diff --git a/python/lsst/obs/hscSim/deprecated.py b/python/lsst/obs/hscSim/deprecated.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 def deprecated(old, new):
     print("WARNING!")
     print("WARNING!")

diff --git a/python/lsst/obs/subaru/SConscript b/python/lsst/obs/subaru/SConscript
@@ -1,7 +1,7 @@
 # -*- python -*-
 from lsst.sconsUtils import env, targets
 
-targets["python"].extend(env.Pybind11LoadableModule("_crosstalk", ["crosstalk.cc"],
+targets["python"].extend(env.Pybind11LoadableModule("_crosstalk", ["_crosstalk.cc"],
                                                 LIBS=env.getLibs("main python")))
-targets["python"].extend(env.Pybind11LoadableModule("_hscDistortion", ["hscDistortion.cc"],
+targets["python"].extend(env.Pybind11LoadableModule("hscDistortion", ["hscDistortion.cc"],
                                                 LIBS=env.getLibs("main python")))
diff --git a/python/lsst/obs/subaru/__init__.py b/python/lsst/obs/subaru/__init__.py
@@ -22,5 +22,9 @@
 
 """lsst.obs.subaru
 """
-from __future__ import absolute_import
-from .subaruLib import *
+from __future__ import absolute_import, division, print_function
+
+# This module is distinct from the crosstalk Python module
+from ._crosstalk import *
+from .hscDistortion import *
+
diff --git a/python/lsst/obs/subaru/crosstalk.cc → python/lsst/obs/subaru/_crosstalk.cc b/python/lsst/obs/subaru/crosstalk.cc → python/lsst/obs/subaru/_crosstalk.cc
@@ -31,14 +31,19 @@ namespace lsst {
 namespace obs {
 namespace subaru {
 
+// Note that _crosstalk is not related to the crosstalk Python module;
+// unfortunately they do have the same name.
 PYBIND11_PLUGIN(_crosstalk) {
+    py::module::import("lsst.afw.image");
+
     py::module mod("_crosstalk");
 
     mod.def("subtractCrosstalk", subtractCrosstalk, "mi"_a, "nAmp"_a, "coeffs1List"_a, "coeffs2List"_a,
             "gainsPreampSig"_a);
 
     return mod.ptr();
 }
-}
-}
-}  // lsst::obs::subaru
+
+}  // subaru
+}  // obs
+}  // lsst
diff --git a/python/lsst/obs/subaru/arcturus.py b/python/lsst/obs/subaru/arcturus.py
@@ -1,5 +1,5 @@
 """Process the scattered light data from Arcturus"""
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import range
 from builtins import object
 

diff --git a/python/lsst/obs/subaru/ccdTesting.py b/python/lsst/obs/subaru/ccdTesting.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import input
 from builtins import zip
 from builtins import range

diff --git a/python/lsst/obs/subaru/crosstalk.py b/python/lsst/obs/subaru/crosstalk.py
@@ -32,7 +32,7 @@
                                              plot=True, title="CCD0..9", fig=1)
 crosstalk.fixCcd(butler, 131634, 0, coeffs)
 """
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import next
 from builtins import range
 import sys

diff --git a/python/lsst/obs/subaru/dither.py b/python/lsst/obs/subaru/dither.py
@@ -1,4 +1,4 @@
-from __future__ import division, print_function
+from __future__ import absolute_import, division, print_function
 from builtins import input
 from builtins import zip
 import lsst.afw.geom as afwGeom

diff --git a/python/lsst/obs/subaru/hscDistortion.cc b/python/lsst/obs/subaru/hscDistortion.cc
@@ -32,8 +32,10 @@ namespace lsst {
 namespace obs {
 namespace subaru {
 
-PYBIND11_PLUGIN(_hscDistortion) {
-    py::module mod("_hscDistortion", "Python wrapper for afw _hscDistortion library");
+PYBIND11_PLUGIN(hscDistortion) {
+    py::module::import("lsst.afw.geom");
+
+    py::module mod("hscDistortion");
 
     py::class_<DistortionPolynomial, std::shared_ptr<DistortionPolynomial>> clsDistortionPolynomial(
             mod, "DistortionPolynomial");
@@ -64,6 +66,7 @@ PYBIND11_PLUGIN(_hscDistortion) {
 
     return mod.ptr();
 }
-}
-}
+
+}  // subaru
+}  // obs
 }  // lsst::obs::subaru
diff --git a/python/lsst/obs/subaru/rings.py b/python/lsst/obs/subaru/rings.py
@@ -25,7 +25,7 @@
 
 rings.plotRadial(r, profs, xlim=(-100, 5500), ylim=(0.8, 1.03))
 """
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import next
 from builtins import range
 from builtins import object

diff --git a/python/lsst/obs/subaru/subaruLib.py b/python/lsst/obs/subaru/subaruLib.py
diff --git a/python/lsst/obs/suprimecam/__init__.py b/python/lsst/obs/suprimecam/__init__.py
@@ -1,2 +1,2 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from .suprimecamMapper import *
diff --git a/python/lsst/obs/suprimecam/makeSuprimecamRawVisitInfo.py b/python/lsst/obs/suprimecam/makeSuprimecamRawVisitInfo.py
@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 
 from ..hsc.makeHscRawVisitInfo import MakeHscRawVisitInfo
 

diff --git a/tests/testDistortion.py b/tests/testDistortion.py
@@ -21,7 +21,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import unittest
 
 import lsst.utils.tests