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.

Sign up for GitHub

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

Jump to bottom

DM-34105: Take into account move of Instrument from obs_base to pipe_base #651

Merged
merged 2 commits into from
Mar 23, 2022
Merged

DM-34105: Take into account move of Instrument from obs_base to pipe_base #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e02465
Use new Instrument.from_string to get the instrument
timj Mar 21, 2022
0a6dc05
Use instrument_argument from pipe_base
timj Mar 21, 2022
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
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/cli/cmd/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
repo_argument,
)
from lsst.daf.butler.cli.utils import ButlerCommand
from lsst.obs.base.cli.opt import instrument_argument
from lsst.pipe.base.cli.opt import instrument_argument
from .opt import (
band_names_argument,
num_subfilters_argument,
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/pipe/tasks/script/makeDiscreteSkyMap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from lsst.daf.butler import Butler
from lsst.skymap import BaseSkyMap
from lsst.pipe.tasks.makeDiscreteSkyMap import MakeDiscreteSkyMapTask, MakeDiscreteSkyMapConfig
from lsst.obs.base.utils import getInstrument
from lsst.pipe.base import Instrument


def makeDiscreteSkyMap(repo, config_file, collections, instrument,
Expand Down Expand Up @@ -53,7 +53,7 @@ def makeDiscreteSkyMap(repo, config_file, collections, instrument,
``skymap_id``. Ignored unless ``config.doAppend=True``.
"""
butler = Butler(repo, collections=collections, writeable=True)
instr = getInstrument(instrument, butler.registry)
instr = Instrument.from_string(instrument, butler.registry)
config = MakeDiscreteSkyMapConfig()
instr.applyConfigOverrides(MakeDiscreteSkyMapTask._DefaultName, config)

Expand Down