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-15503: better handling of raws and cameraGeom in gen2->gen3 conversion #65

Merged
merged 3 commits into from Dec 14, 2018
Merged

DM-15503: better handling of raws and cameraGeom in gen2->gen3 conversion #65

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94c9485
Adapt to Gen3 Instrument class refactoring.
TallJimbo Dec 11, 2018
1e2696e
Write Camera to converted Gen3 repo.
TallJimbo Dec 11, 2018
25c5264
Workaround for config import load bug.
TallJimbo Dec 14, 2018
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
5 changes: 3 additions & 2 deletions bin.src/gen3.py
View file
Open in desktop
Expand Up @@ -26,14 +26,15 @@
from lsst.log import Log
from lsst.ci.hsc import gen3

from lsst.obs.subaru.gen3.hsc import HyperSuprimeCam


def main():
registry = gen3.getRegistry()
datastore = gen3.getDatastore(registry)
if not registry.findDimensionEntry("Instrument", {"instrument": "HSC"}):
gen3.registerInstrument(registry)
walker = gen3.walk()
gen3.write(walker, registry, datastore)
HyperSuprimeCam().writeCamera(gen3.getButler("calib"))


if __name__ == "__main__":
Expand Down
10 changes: 1 addition & 9 deletions python/lsst/ci/hsc/gen3.py
View file
Open in desktop
Expand Up @@ -24,8 +24,6 @@
from lsst.utils import getPackageDir
from lsst.daf.butler import Butler, ButlerConfig, Registry, Datastore, Config, StorageClassFactory
from lsst.daf.butler.gen2convert import ConversionWalker, ConversionWriter
from lsst.obs.subaru.gen3.hsc import HyperSuprimeCam
from lsst.obs.hsc import HscMapper

REPO_ROOT = os.path.join(getPackageDir("ci_hsc"), "DATA")

Expand All @@ -46,13 +44,7 @@ def getDatastore(registry):


def getButler(collection):
return Butler(config=butlerConfig, collection=collection)


def registerInstrument(registry):
mapper = HscMapper(root=REPO_ROOT)
instrument = HyperSuprimeCam(mapper)
instrument.register(registry)
return Butler(config=butlerConfig, run=collection)


def walk():
Expand Down