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-21849: Support new way of doing collections #131

Merged
merged 4 commits into from
Mar 25, 2020
Merged

DM-21849: Support new way of doing collections #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cab1c2
Update conversion parameters to match obs_base changes
timj Mar 12, 2020
8c0488e
Associate each refcat with a run
timj Mar 12, 2020
793ae14
Drop expectation that gen2to3 will involve skymaps.
TallJimbo Mar 23, 2020
51e851f
Build on expected converted collections from obs_base.
TallJimbo Mar 24, 2020
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
4 changes: 4 additions & 0 deletions tests/config/convert2to3Config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
# testdata_decam, with two refcats in the repo.

config.refCats = ['gaia', 'panstarrs']

# Need to specify runs for each refcat
for refcat in config.refCats:
config.runs[refcat] = "refcats"
3 changes: 2 additions & 1 deletion tests/test_convert2to3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def setUp(self):
self.instrumentClass = "lsst.obs.decam.DarkEnergyCamera"
self.config = os.path.join(os.path.abspath(os.path.dirname(__file__)),
"config", "convert2to3Config.py")
self.args = ("--calibFilterType", "abstract_filter")
self.kwargs = {"calibFilterType": "abstract_filter"}

detectors = (5, 10, 56, 60)
dates = ('2015-02-18', '2015-03-13')
Expand All @@ -65,6 +65,7 @@ def setUp(self):
for detector, date in itertools.product(detectors, dates)]
self.refcats = ['gaia', 'panstarrs']
super().setUp()
self.collections.add("calib/DECam")


def setup_module(module):
Expand Down