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-29017: Update to new detector id-indexed visitSummary catalog. #172

Merged
merged 1 commit into from
Mar 3, 2021
Merged
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
6 changes: 4 additions & 2 deletions python/lsst/jointcal/jointcal.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ class JointcalTaskConnections(pipeBase.PipelineTaskConnections,
multiple=True,
)
inputVisitSummary = pipeBase.connectionTypes.Input(
doc="Visit summary tables built from the calexps for these observations.",
doc=("Per-visit consolidated exposure metadata built from calexps. "
"These catalogs use detector id for the id and must be sorted for "
"fast lookups of a detector."),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this is Input, I would phrase it as "...and must be sorted for fast ...", since that's a requirement on the files, not something this package guarantees.

name="visitSummary",
storageClass="ExposureCatalog",
dimensions=("instrument", "visit", "physical_filter"),
Expand Down Expand Up @@ -767,7 +769,7 @@ def _load_data(self, inputSourceTableVisit, inputVisitSummary, associations, joi
selected = self.sourceSelector.run(visitCatalog)

# Build a CcdImage for each detector in this visit.
detectors = {id: index for index, id in enumerate(visitSummary['detector_id'])}
detectors = {id: index for index, id in enumerate(visitSummary['id'])}
for id, index in detectors.items():
catalog = self._extract_detector_catalog_from_visit_catalog(table, selected.sourceCat, id)
data = self._make_one_input_data(visitSummary[index], catalog)
Expand Down