Merge pull request #111 from lsst/tickets/DM-40500

DM-40500: remove now-unnecessary lookupFunctions.

python/lsst/fgcmcal/fgcmBuildFromIsolatedStars.py

@@ -45,7 +45,6 @@
 
 from .fgcmBuildStarsBase import FgcmBuildStarsConfigBase, FgcmBuildStarsBaseTask
 from .utilities import computeApproxPixelAreaFields, computeApertureRadiusFromName
-from .utilities import lookupStaticCalibrations
 
 __all__ = ["FgcmBuildFromIsolatedStarsConfig", "FgcmBuildFromIsolatedStarsTask"]
 
@@ -58,7 +57,6 @@ class FgcmBuildFromIsolatedStarsConnections(pipeBase.PipelineTaskConnections,
         name="camera",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
     )
     fgcm_lookup_table = connectionTypes.PrerequisiteInput(

python/lsst/fgcmcal/fgcmBuildStarsTable.py

@@ -43,7 +43,6 @@
 
 from .fgcmBuildStarsBase import FgcmBuildStarsConfigBase, FgcmBuildStarsBaseTask
 from .utilities import computeApproxPixelAreaFields, computeApertureRadiusFromName
-from .utilities import lookupStaticCalibrations
 
 __all__ = ['FgcmBuildStarsTableConfig', 'FgcmBuildStarsTableTask']
 
@@ -56,7 +55,6 @@ class FgcmBuildStarsTableConnections(pipeBase.PipelineTaskConnections,
         name="camera",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
     )
 

python/lsst/fgcmcal/fgcmCalibrateTractTable.py

@@ -32,7 +32,6 @@
 from .fgcmBuildStarsTable import FgcmBuildStarsTableTask
 from .fgcmCalibrateTractBase import (FgcmCalibrateTractConfigBase,
                                      FgcmCalibrateTractBaseTask)
-from .utilities import lookupStaticCalibrations
 
 __all__ = ['FgcmCalibrateTractTableConfig', 'FgcmCalibrateTractTableTask']
 
@@ -45,7 +44,6 @@ class FgcmCalibrateTractTableConnections(pipeBase.PipelineTaskConnections,
         name="camera",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
     )
 

python/lsst/fgcmcal/fgcmFitCycle.py

@@ -47,7 +47,6 @@
 from .utilities import makeZptSchema, makeZptCat
 from .utilities import makeAtmSchema, makeAtmCat, makeStdSchema, makeStdCat
 from .sedterms import SedboundarytermDict, SedtermDict
-from .utilities import lookupStaticCalibrations
 from .focalPlaneProjector import FocalPlaneProjector
 
 import fgcm
@@ -66,7 +65,6 @@ class FgcmFitCycleConnections(pipeBase.PipelineTaskConnections,
         name="camera",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
     )
 

python/lsst/fgcmcal/fgcmMakeLut.py

@@ -55,7 +55,6 @@ class FgcmMakeLutConnections(pipeBase.PipelineTaskConnections,
         name="camera",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
     )
 
@@ -64,7 +63,6 @@ class FgcmMakeLutConnections(pipeBase.PipelineTaskConnections,
         name="transmission_optics",
         storageClass="TransmissionCurve",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
         deferLoad=True,
     )

python/lsst/fgcmcal/fgcmOutputProducts.py

@@ -51,7 +51,6 @@
 import lsst.afw.table as afwTable
 
 from .utilities import computeApproxPixelAreaFields
-from .utilities import lookupStaticCalibrations
 from .utilities import FGCM_ILLEGAL_VALUE
 
 import fgcm
@@ -67,7 +66,6 @@ class FgcmOutputProductsConnections(pipeBase.PipelineTaskConnections,
         name="camera",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibrations,
         isCalibration=True,
     )
 

python/lsst/fgcmcal/utilities.py

@@ -29,12 +29,12 @@
 import re
 
 from lsst.daf.base import PropertyList
+from lsst.daf.butler import Timespan
 import lsst.afw.table as afwTable
 import lsst.afw.image as afwImage
 import lsst.afw.math as afwMath
 import lsst.geom as geom
 from lsst.obs.base import createInitialSkyWcs
-from lsst.pipe.base import Instrument
 
 import fgcm
 
@@ -855,9 +855,15 @@ def extractReferenceMags(refStars, bands, filterMap):
 
 
 def lookupStaticCalibrations(datasetType, registry, quantumDataId, collections):
-    instrument = Instrument.fromName(quantumDataId["instrument"], registry)
-    unboundedCollection = instrument.makeUnboundedCalibrationRunName()
-
-    return registry.queryDatasets(datasetType,
-                                  dataId=quantumDataId,
-                                  collections=[unboundedCollection])
+    # For static calibrations, we search with a timespan that has unbounded
+    # begin and end; we'll get an error if there's more than one match (because
+    # then it's not static).
+    timespan = Timespan(begin=None, end=None)
+    result = []
+    # First iterate over all of the data IDs for this dataset type that are
+    # consistent with the quantum data ID.
+    for dataId in registry.queryDataIds(datasetType.dimensions, dataId=quantumDataId):
+        # Find the dataset with this data ID using the unbounded timespan.
+        if ref := registry.findDataset(datasetType, dataId, collections=collections, timespan=timespan):
+            result.append(ref)
+    return result