Skip to content

Commit

Permalink
Merge branch 'tickets/DM-24638'
Browse files Browse the repository at this point in the history
  • Loading branch information
yalsayyad committed Feb 24, 2021
2 parents 31a9db6 + 239467c commit 4778fb9
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 81 deletions.
38 changes: 3 additions & 35 deletions config/makeCoaddTempExp.py
Original file line number Diff line number Diff line change
@@ -1,37 +1,5 @@
# 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/>.

import os.path

# Load configs shared between assembleCoadd and makeCoaddTempExp
config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py"))

config.makePsfMatched = True
config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
config.modelPsf.defaultFwhm = 7.7

# FUTURE: Set both to True when we decide to run jointcal
config.doApplyExternalPhotoCalib = False
config.doApplyExternalSkyWcs = False

# FUTURE: Set to True when we have sky background estimate
config.doApplySkyCorr = False
# Gen3 makeWarp Gen3 supersede makeCoaddTempExp.
# Keep in sync in the meantime
config.load(os.path.join(os.path.dirname(__file__), "makeWarp.py"))
37 changes: 37 additions & 0 deletions config/makeWarp.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# 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/>.

import os.path

# Load configs shared between assembleCoadd and makeCoaddTempExp
config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py"))

config.makePsfMatched = True
config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
config.modelPsf.defaultFwhm = 7.7

# FUTURE: Set both to True when we decide to run jointcal
config.doApplyExternalPhotoCalib = False
config.doApplyExternalSkyWcs = False

# FUTURE: Set to True when we have sky background estimate
config.doApplySkyCorr = False
27 changes: 4 additions & 23 deletions config/mergeCoaddDetections.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
# 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/>.

config.priorityList = ["i", "r", "z", "y", "g", "u"]
import os.path
# Gen3 mergeDetections will supersede mergeCoaddDetections
# Keep in sync in the meantime
config.load(os.path.join(os.path.dirname(__file__), "mergeDetections.py"))
27 changes: 4 additions & 23 deletions config/mergeCoaddMeasurements.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
# 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/>.

config.priorityList = ["i", "r", "z", "y", "g", "u"]
import os.path
# Gen3 mergeMeasurements will supersede mergeCoaddMeasurements
# Keep in sync in the meantime
config.load(os.path.join(os.path.dirname(__file__), "mergeMeasurements.py"))
23 changes: 23 additions & 0 deletions config/mergeDetections.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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/>.

config.priorityList = ["i", "r", "z", "y", "g", "u"]
23 changes: 23 additions & 0 deletions config/mergeMeasurements.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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/>.

config.priorityList = ["i", "r", "z", "y", "g", "u"]
5 changes: 5 additions & 0 deletions pipelines/DRP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description: DRP pipeline applicable to all cameras in obs_lsst
imports:
- location: $PIPE_TASKS_DIR/pipelines/DRP.yaml
exclude:
- sourceTable
5 changes: 5 additions & 0 deletions pipelines/imsim/DRP.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description: DRP specialized for LSSTImSim
instrument: lsst.obs.lsst.LsstCamImSim
imports:
# Inherits directly from pipe_tasks to avoid redefining sourceTable subset
- location: $PIPE_TASKS_DIR/pipelines/DRP.yaml

0 comments on commit 4778fb9

Please sign in to comment.