Skip to content

Commit

Permalink
Remove lookupStaticCalibrations and all usage of it.
Browse files Browse the repository at this point in the history
Following DM-38498 static calibrations are now found correctly without
any customization by the task.
  • Loading branch information
TallJimbo committed Aug 25, 2023
1 parent 98cecbd commit 7b8f9e5
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 25 deletions.
2 changes: 0 additions & 2 deletions python/lsst/fgcmcal/fgcmBuildFromIsolatedStars.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@

from .fgcmBuildStarsBase import FgcmBuildStarsConfigBase, FgcmBuildStarsBaseTask
from .utilities import computeApproxPixelAreaFields, computeApertureRadiusFromName
from .utilities import lookupStaticCalibrations

__all__ = ["FgcmBuildFromIsolatedStarsConfig", "FgcmBuildFromIsolatedStarsTask"]

Expand All @@ -58,7 +57,6 @@ class FgcmBuildFromIsolatedStarsConnections(pipeBase.PipelineTaskConnections,
name="camera",
storageClass="Camera",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
)
fgcm_lookup_table = connectionTypes.PrerequisiteInput(
Expand Down
2 changes: 0 additions & 2 deletions python/lsst/fgcmcal/fgcmBuildStarsTable.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

from .fgcmBuildStarsBase import FgcmBuildStarsConfigBase, FgcmBuildStarsBaseTask
from .utilities import computeApproxPixelAreaFields, computeApertureRadiusFromName
from .utilities import lookupStaticCalibrations

__all__ = ['FgcmBuildStarsTableConfig', 'FgcmBuildStarsTableTask']

Expand All @@ -56,7 +55,6 @@ class FgcmBuildStarsTableConnections(pipeBase.PipelineTaskConnections,
name="camera",
storageClass="Camera",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
)

Expand Down
2 changes: 0 additions & 2 deletions python/lsst/fgcmcal/fgcmCalibrateTractTable.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from .fgcmBuildStarsTable import FgcmBuildStarsTableTask
from .fgcmCalibrateTractBase import (FgcmCalibrateTractConfigBase,
FgcmCalibrateTractBaseTask)
from .utilities import lookupStaticCalibrations

__all__ = ['FgcmCalibrateTractTableConfig', 'FgcmCalibrateTractTableTask']

Expand All @@ -45,7 +44,6 @@ class FgcmCalibrateTractTableConnections(pipeBase.PipelineTaskConnections,
name="camera",
storageClass="Camera",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
)

Expand Down
2 changes: 0 additions & 2 deletions python/lsst/fgcmcal/fgcmFitCycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -66,7 +65,6 @@ class FgcmFitCycleConnections(pipeBase.PipelineTaskConnections,
name="camera",
storageClass="Camera",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
)

Expand Down
5 changes: 0 additions & 5 deletions python/lsst/fgcmcal/fgcmMakeLut.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import lsst.afw.table as afwTable
import lsst.afw.cameraGeom as afwCameraGeom
from lsst.afw.image import TransmissionCurve
from .utilities import lookupStaticCalibrations

import fgcm

Expand All @@ -55,7 +54,6 @@ class FgcmMakeLutConnections(pipeBase.PipelineTaskConnections,
name="camera",
storageClass="Camera",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
)

Expand All @@ -64,7 +62,6 @@ class FgcmMakeLutConnections(pipeBase.PipelineTaskConnections,
name="transmission_optics",
storageClass="TransmissionCurve",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
deferLoad=True,
)
Expand All @@ -74,7 +71,6 @@ class FgcmMakeLutConnections(pipeBase.PipelineTaskConnections,
name="transmission_sensor",
storageClass="TransmissionCurve",
dimensions=("instrument", "detector",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
deferLoad=True,
multiple=True,
Expand All @@ -85,7 +81,6 @@ class FgcmMakeLutConnections(pipeBase.PipelineTaskConnections,
name="transmission_filter",
storageClass="TransmissionCurve",
dimensions=("band", "instrument", "physical_filter",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
deferLoad=True,
multiple=True,
Expand Down
2 changes: 0 additions & 2 deletions python/lsst/fgcmcal/fgcmOutputProducts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -67,7 +66,6 @@ class FgcmOutputProductsConnections(pipeBase.PipelineTaskConnections,
name="camera",
storageClass="Camera",
dimensions=("instrument",),
lookupFunction=lookupStaticCalibrations,
isCalibration=True,
)

Expand Down
10 changes: 0 additions & 10 deletions python/lsst/fgcmcal/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
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

Expand Down Expand Up @@ -852,12 +851,3 @@ def extractReferenceMags(refStars, bands, filterMap):
raise RuntimeError("FGCM reference stars missing FILTERNAMES metadata.")

return refMag, refMagErr


def lookupStaticCalibrations(datasetType, registry, quantumDataId, collections):
instrument = Instrument.fromName(quantumDataId["instrument"], registry)
unboundedCollection = instrument.makeUnboundedCalibrationRunName()

return registry.queryDatasets(datasetType,
dataId=quantumDataId,
collections=[unboundedCollection])

0 comments on commit 7b8f9e5

Please sign in to comment.