Merge pull request #82 from lsst/tickets/DM-17903

DM-17903: Ensure that ccdKeys is set

config/bias.py

@@ -23,4 +23,5 @@
 import os.path
 from lsst.utils import getPackageDir
 
+config.load(os.path.join(getPackageDir("obs_lsst"), "config", "lsstCamCommon.py"))
 config.isr.load(os.path.join(getPackageDir("obs_lsst"), "config", "isr.py"))

config/dark.py

@@ -23,6 +23,7 @@
 import os.path
 from lsst.utils import getPackageDir
 
+config.load(os.path.join(getPackageDir("obs_lsst"), "config", "lsstCamCommon.py"))
 config.isr.load(os.path.join(getPackageDir("obs_lsst"), "config", "isr.py"))
 
 #config.repair.cosmicray.nCrPixelMax = 100000

config/flat.py

@@ -23,4 +23,5 @@
 import os.path
 from lsst.utils import getPackageDir
 
+config.load(os.path.join(getPackageDir("obs_lsst"), "config", "lsstCamCommon.py"))
 config.isr.load(os.path.join(getPackageDir("obs_lsst"), "config", "isr.py"))

config/isr.py

@@ -23,8 +23,6 @@
 """
 LSST Cam-specific overrides for IsrTask
 """
-if hasattr(config, 'ccdKeys'):
-    config.ccdKeys = ['detector', 'snap', 'raftName', 'detectorName']
 
 config.doLinearize = False
 config.doDefect = False

config/lsstCamCommon.py

@@ -0,0 +1,27 @@
+# This file is part of obs_lsst.
+#
+# Developed for the LSST Data Management System.
+# This product includes software developed by the LSST Project
+# (http://www.lsst.org).
+# See the COPYRIGHT file at the top-level directory of this distribution
+# for details of code ownership.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the LSST License Statement and
+# the GNU General Public License along with this program.  If not,
+# see <http://www.lsstcorp.org/LegalNotices/>.
+
+"""
+LSST Cam generic settings
+"""
+if hasattr(config, 'ccdKeys'):
+    config.ccdKeys = ['detector', 'snap', 'raftName', 'detectorName']

config/sky.py

@@ -28,10 +28,11 @@
 #from lsst.obs.lsst.isr import SubaruIsrTask
 #config.isr.retarget(SubaruIsrTask)
 #config.isr.load(os.path.join(getPackageDir("obs_lsst"), "config", "isr.py"))
+configDir = os.path.join(getPackageDir("obs_lsst"), "config")
 
-config.load(os.path.join(getPackageDir("obs_lsst"), "config", "isr.py"))
+config.load(os.path.join(configDir, "lsstCamCommon.py"))
+config.isr.load(os.path.join(configDir, "isr.py"))
 
-configDir = os.path.join(getPackageDir("obs_lsst"), "config")
 bgFile = os.path.join(configDir, "background.py")
 fpBgFile = os.path.join(configDir, "focalPlaneBackground.py")