Tickets/dm 11653

config/bias.py

@@ -1,2 +1,2 @@
-config.isr.doLinearize=False
-config.isr.doDefect=False
+config.isr.doLinearize = False
+config.isr.doDefect = False

config/dark.py

@@ -1,3 +1,3 @@
-config.isr.doLinearize=False
-config.isr.doDefect=False
-config.repair.cosmicray.nCrPixelMax=100000
+config.isr.doLinearize = False
+config.isr.doDefect = False
+config.repair.cosmicray.nCrPixelMax = 100000

config/flat.py

@@ -1,2 +1,2 @@
-config.isr.doLinearize=False
-config.isr.doDefect=False
+config.isr.doLinearize = False
+config.isr.doDefect = False

python/lsst/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import pkgutil
 import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)

python/lsst/obs/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import pkgutil
 import lsstimport
 __path__ = pkgutil.extend_path(__path__, __name__)

python/lsst/obs/comCam/__init__.py

@@ -19,6 +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 .version import *
 from .comCam import *
 from .comCamMapper import *

python/lsst/obs/comCam/comCam.py

@@ -19,10 +19,12 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import division, print_function
 import os.path
 import lsst.utils as utils
 from lsst.obs.base.yamlCamera import YamlCamera
 
+
 class ComCam(YamlCamera):
     """The Commissioning Camera (comCam)
     """

python/lsst/obs/comCam/comCamMapper.py

@@ -19,6 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
+from __future__ import division, print_function
+
 import lsst.afw.image.utils as afwImageUtils
 import lsst.afw.geom as afwGeom
 import lsst.afw.image as afwImage
@@ -29,6 +31,7 @@
 
 __all__ = ["ComCamMapper"]
 
+
 class ComCamMakeRawVisitInfo(MakeRawVisitInfo):
     """functor to make a VisitInfo from the FITS header of a raw image
     """
@@ -48,7 +51,6 @@ def setArgDict(self, md, argDict):
 
         # Done setting argDict; check values now that all the header keywords have been consumed
         argDict["darkTime"] = self.getDarkTime(argDict)
-
 
     def getDateAvg(self, md, exposureTime):
         """Return date at the middle of the exposure
@@ -63,6 +65,7 @@ def getDateAvg(self, md, exposureTime):
         dateObs = self.popIsoDate(md, "DATE-OBS")
         return self.offsetDate(dateObs, 0.5*exposureTime)
 
+
 def assemble_raw(dataId, componentInfo, cls):
     """Called by the butler to construct the composite type "raw"
 
@@ -111,6 +114,7 @@ def assemble_raw(dataId, componentInfo, cls):
 
     return exposure
 
+
 class ComCamMapper(CameraMapper):
     packageName = 'obs_comCam'
     MakeRawVisitInfoClass = ComCamMakeRawVisitInfo
@@ -184,6 +188,7 @@ def query_raw_amp(self, format, dataId):
     # The composite type "raw" doesn't provide e.g. query_raw, so we defined type _raw in the .paf file
     # with the same template, and forward requests as necessary
     #
+
     def query_raw(self, *args, **kwargs):
         return self.query__raw(*args, **kwargs)
 
@@ -210,7 +215,7 @@ def bypass_raw_visitInfo(self, datasetType, pythonType, location, dataId):
         else:
             import re
             import lsst.afw.image as afwImage
-            
+
             fileName = location.getLocationsWithRoot()[0]
             mat = re.search(r"\[(\d+)\]$", fileName)
             if mat:
@@ -246,7 +251,7 @@ def X_bypass_defects(self, datasetType, pythonType, location, dataId):
                     # These may be hot pixels, but we'll treat them as bad until we can get more data
                     (3801, 666, 3805, 669),
                     (3934, 582, 3936, 589),
-                )]
+        )]
 
     def X__defectLookup(self, dataId):
         """ This function needs to return a non-None value otherwise the mapper gives up

python/lsst/obs/comCam/ingest.py

@@ -1,9 +1,9 @@
-from __future__ import print_function
+from __future__ import division, print_function
 import os
 import re
 from lsst.pipe.tasks.ingest import ParseTask
 from lsst.pipe.tasks.ingestCalibs import CalibsParseTask
-import lsst.log as lsstLog 
+import lsst.log as lsstLog
 
 EXTENSIONS = ["fits", "gz", "fz"]  # Filename extensions to strip off
 
@@ -19,7 +19,7 @@ def __init__(self, config, *args, **kwargs):
 
     def getInfo(self, filename):
         """ Get the basename and other data which is only available from the filename/path.
-        
+
         This seems fragile, but this is how the teststand data will *always* be written out, 
         as the software has been "frozen" as they are now in production mode.
 
@@ -83,9 +83,10 @@ def translate_wavelength(self, md):
         """
         raw_wl = md.get("MONOWL")
         wl = int(round(raw_wl))
-        if abs(raw_wl-wl)>=0.1:
+        if abs(raw_wl-wl) >= 0.1:
             logger = lsstLog.Log.getLogger('obs.comCam.ingest')
-            logger.warn('Translated significantly non-integer wavelength; %s is more than 0.1nm from an integer value', raw_wl)
+            logger.warn(
+                'Translated significantly non-integer wavelength; %s is more than 0.1nm from an integer value', raw_wl)
         return wl
 
     def translate_visit(self, md):
@@ -109,6 +110,7 @@ def translate_visit(self, md):
 
 ##############################################################################################################
 
+
 class ComCamCalibsParseTask(CalibsParseTask):
     """Parser for calibs"""