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

DM-40500: remove now-unnecessary lookupFunctions.

python/lsst/cp/pipe/cpFlatNormTask.py

@@ -29,8 +29,6 @@
 from lsst.ip.isr.vignette import maskVignettedRegion
 from lsst.cp.pipe.utils import ddict2dict
 
-from ._lookupStaticCalibration import lookupStaticCalibration
-
 __all__ = ["CpFlatMeasureTask", "CpFlatMeasureTaskConfig",
            "CpFlatNormalizationTask", "CpFlatNormalizationTaskConfig"]
 
@@ -153,7 +151,6 @@ class CpFlatNormalizationConnections(pipeBase.PipelineTaskConnections,
         doc="Input camera to use for gain lookup.",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibration,
         isCalibration=True,
     )
 

python/lsst/cp/pipe/cpSkyTask.py

@@ -27,7 +27,6 @@
 from lsst.pipe.tasks.background import (FocalPlaneBackground, MaskObjectsTask, SkyMeasurementTask,
                                         FocalPlaneBackgroundConfig)
 from lsst.daf.base import PropertyList
-from ._lookupStaticCalibration import lookupStaticCalibration
 from .cpCombine import CalibCombineTask
 
 __all__ = ['CpSkyImageTask', 'CpSkyImageConfig',
@@ -49,7 +48,6 @@ class CpSkyImageConnections(pipeBase.PipelineTaskConnections,
         doc="Input camera to use for geometry.",
         storageClass="Camera",
         dimensions=("instrument",),
-        lookupFunction=lookupStaticCalibration,
         isCalibration=True,
     )
 

python/lsst/cp/pipe/defects.py

@@ -43,8 +43,6 @@
 from lsst.ip.isr import Defects, countMaskedPixels
 from lsst.pex.exceptions import InvalidParameterError
 
-from ._lookupStaticCalibration import lookupStaticCalibration
-
 
 class MeasureDefectsConnections(pipeBase.PipelineTaskConnections,
                                 dimensions=("instrument", "exposure", "detector")):
@@ -61,7 +59,6 @@ class MeasureDefectsConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     outputDefects = cT.Output(
@@ -624,7 +621,6 @@ class MeasureDefectsCombinedConnections(MeasureDefectsConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     outputDefects = cT.Output(
@@ -666,7 +662,6 @@ class MeasureDefectsCombinedWithFilterConnections(MeasureDefectsCombinedConnecti
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     outputDefects = cT.Output(
@@ -707,7 +702,6 @@ class MergeDefectsConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     mergedDefects = cT.Output(
@@ -897,7 +891,6 @@ class MergeDefectsCombinedConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     mergedDefects = cT.Output(

python/lsst/cp/pipe/deferredCharge.py

@@ -39,8 +39,6 @@
 from lsst.ip.isr import DeferredChargeCalib, SerialTrap
 from lmfit import Minimizer, Parameters
 
-from ._lookupStaticCalibration import lookupStaticCalibration
-
 
 class CpCtiSolveConnections(pipeBase.PipelineTaskConnections,
                             dimensions=("instrument", "detector")):
@@ -56,7 +54,6 @@ class CpCtiSolveConnections(pipeBase.PipelineTaskConnections,
         doc="Camera geometry to use.",
         storageClass="Camera",
         dimensions=("instrument", ),
-        lookupFunction=lookupStaticCalibration,
         isCalibration=True,
     )
 

python/lsst/cp/pipe/linearity.py

@@ -32,7 +32,6 @@
 from lsst.ip.isr import (Linearizer, IsrProvenance)
 
 from .utils import funcPolynomial, irlsFit, AstierSplineLinearityFitter
-from ._lookupStaticCalibration import lookupStaticCalibration
 
 
 def ptcLookup(datasetType, registry, quantumDataId, collections):
@@ -91,7 +90,6 @@ class LinearitySolveConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     inputPtc = cT.PrerequisiteInput(

python/lsst/cp/pipe/makeBrighterFatterKernel.py

@@ -33,7 +33,6 @@
 
 from lsst.ip.isr import (BrighterFatterKernel)
 from .utils import (funcPolynomial, irlsFit)
-from ._lookupStaticCalibration import lookupStaticCalibration
 
 
 class BrighterFatterKernelSolveConnections(pipeBase.PipelineTaskConnections,
@@ -52,7 +51,6 @@ class BrighterFatterKernelSolveConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
     inputPtc = cT.PrerequisiteInput(
         name="ptc",

python/lsst/cp/pipe/measureCrosstalk.py

@@ -34,8 +34,6 @@
 from lsst.cp.pipe.utils import (ddict2dict, sigmaClipCorrection)
 from lsst.meas.algorithms import SubtractBackgroundTask
 
-from ._lookupStaticCalibration import lookupStaticCalibration
-
 __all__ = ["CrosstalkExtractConfig", "CrosstalkExtractTask",
            "CrosstalkSolveTask", "CrosstalkSolveConfig"]
 
@@ -351,7 +349,6 @@ class CrosstalkSolveConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument",),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     outputCrosstalk = cT.Output(

python/lsst/cp/pipe/pdCorrection.py

@@ -25,7 +25,6 @@
 import lsst.pipe.base.connectionTypes as cT
 
 from lsst.ip.isr import (PhotodiodeCorrection, IsrProvenance)
-from ._lookupStaticCalibration import lookupStaticCalibration
 
 __all__ = ["PhotodiodeCorrectionTask", "PhotodiodeCorrectionConfig"]
 
@@ -39,7 +38,6 @@ class PhotodiodeCorrectionConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument", ),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
 
     inputPtc = cT.PrerequisiteInput(

python/lsst/cp/pipe/ptc/cpPlotPtcTask.py

@@ -30,7 +30,6 @@
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 import lsst.pipe.base.connectionTypes as cT
-from lsst.cp.pipe._lookupStaticCalibration import lookupStaticCalibration
 
 from lsst.cp.pipe.utils import (
     funcAstier,
@@ -57,7 +56,6 @@ class PlotPhotonTransferCurveConnections(
         storageClass="Camera",
         dimensions=("instrument",),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
     # ptcFitType = "FULLCOVARIANCE" produces 12 plots
     ptcPlot1 = cT.Output(

python/lsst/cp/pipe/ptc/cpSolvePtcTask.py

@@ -35,8 +35,6 @@
 
 from lsst.ip.isr import PhotonTransferCurveDataset
 
-from lsst.cp.pipe._lookupStaticCalibration import lookupStaticCalibration
-
 import copy
 
 
@@ -59,7 +57,6 @@ class PhotonTransferCurveSolveConnections(pipeBase.PipelineTaskConnections,
         storageClass="Camera",
         dimensions=("instrument",),
         isCalibration=True,
-        lookupFunction=lookupStaticCalibration,
     )
     outputPtcDataset = cT.Output(
         name="ptcDatsetProposal",