Update to new id-indexed visitSummary catalog.

lsst · Mar 3, 2021 · c698a31 · c698a31
1 parent 1c7428d
commit c698a31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/python/lsst/fgcmcal/fgcmBuildStarsBase.py b/python/lsst/fgcmcal/fgcmBuildStarsBase.py
@@ -559,16 +559,13 @@ def _fillVisitCatalog(self, visitCat, groupedDataRefs, bkgDataRefDict=None,
                 # Gen3: use the visitSummary dataRef
                 summary = dataRef.get()
 
-                detectors = list(summary['detector_id'])
+                summaryRow = summary.find(self.config.referenceCCD)
+                if summaryRow is None:
+                    # Take the first available ccd if reference isn't available
+                    summaryRow = summary[0]
 
-                try:
-                    index = detectors.index(self.config.referenceCCD)
-                except ValueError:
-                    # Take first available ccd if reference isn't available
-                    index = 0
-
-                visitInfo = summary[index].getVisitInfo()
-                physicalFilter = summary[index]['physical_filter']
+                visitInfo = summaryRow.getVisitInfo()
+                physicalFilter = summaryRow['physical_filter']
                 # Compute the median psf sigma if possible
                 goodSigma, = np.where(summary['psfSigma'] > 0)
                 if goodSigma.size > 2:

diff --git a/python/lsst/fgcmcal/fgcmBuildStarsTable.py b/python/lsst/fgcmcal/fgcmBuildStarsTable.py
@@ -95,7 +95,9 @@ class FgcmBuildStarsTableConnections(pipeBase.PipelineTaskConnections,
     )
 
     visitSummary = connectionTypes.Input(
-        doc="Per-visit summary statistics table",
+        doc=("Per-visit consolidated exposure metadata.  These catalogs use "
+             "detector id for the id and are sorted for fast lookups of a "
+             "detector."),
         name="visitSummary",
         storageClass="ExposureCatalog",
         dimensions=("instrument", "visit"),