Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-17903: Ensure that ccdKeys is set #82

Merged
merged 1 commit into from
Feb 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions config/bias.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
1 change: 1 addition & 0 deletions config/dark.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import os.path
from lsst.utils import getPackageDir

config.load(os.path.join(getPackageDir("obs_lsst"), "config", "lsstCamCommon.py"))
RobertLuptonTheGood marked this conversation as resolved.
Show resolved Hide resolved
config.isr.load(os.path.join(getPackageDir("obs_lsst"), "config", "isr.py"))

#config.repair.cosmicray.nCrPixelMax = 100000
1 change: 1 addition & 0 deletions config/flat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
2 changes: 0 additions & 2 deletions config/isr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 27 additions & 0 deletions config/lsstCamCommon.py
Original file line number Diff line number Diff line change
@@ -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']
5 changes: 3 additions & 2 deletions config/sky.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down