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.

Sign up for GitHub

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

Jump to bottom

DM-26738: Rename abstract_filter to band #167

Merged
merged 1 commit into from
Sep 25, 2020
Merged

DM-26738: Rename abstract_filter to band #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions python/lsst/obs/decam/_instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

from lsst.afw.cameraGeom import makeCameraFromPath, CameraConfig
from lsst.obs.base import Instrument
from lsst.obs.base.gen2to3 import AbstractToPhysicalFilterKeyHandler, TranslatorFactory
from lsst.obs.base.gen2to3 import BandToPhysicalFilterKeyHandler, TranslatorFactory
from lsst.obs.decam.decamFilters import DECAM_FILTER_DEFINITIONS

from lsst.daf.butler.core.utils import getFullTypeName
Expand Down Expand Up @@ -100,11 +100,11 @@ def getRawFormatter(self, dataId):
def makeDataIdTranslatorFactory(self) -> TranslatorFactory:
# Docstring inherited from lsst.obs.base.Instrument.
factory = TranslatorFactory()
factory.addGenericInstrumentRules(self.getName(), calibFilterType="abstract_filter",
factory.addGenericInstrumentRules(self.getName(), calibFilterType="band",
detectorKey="ccdnum")
# DECam calibRegistry entries are abstract_filters, but we need physical_filter
# DECam calibRegistry entries are bands, but we need physical_filter
# in the gen3 registry.
factory.addRule(AbstractToPhysicalFilterKeyHandler(self.filterDefinitions),
factory.addRule(BandToPhysicalFilterKeyHandler(self.filterDefinitions),
instrument=self.getName(),
gen2keys=("filter",),
consume=("filter",),
Expand Down
16 changes: 8 additions & 8 deletions python/lsst/obs/decam/decamFilters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@
# from http://www.ctio.noao.edu/noao/sites/default/files/DECam/DECam_filters_transmission.txt
DECAM_FILTER_DEFINITIONS = FilterDefinitionCollection(
FilterDefinition(physical_filter="u DECam c0006 3500.0 1000.0",
abstract_filter="u",
band="u",
lambdaEff=350, lambdaMin=305, lambdaMax=403),
FilterDefinition(physical_filter="g DECam SDSS c0001 4720.0 1520.0",
abstract_filter="g",
band="g",
lambdaEff=450, lambdaMin=394, lambdaMax=555),
FilterDefinition(physical_filter="r DECam SDSS c0002 6415.0 1480.0",
abstract_filter="r",
band="r",
lambdaEff=600, lambdaMin=562, lambdaMax=725),
FilterDefinition(physical_filter="i DECam SDSS c0003 7835.0 1470.0",
abstract_filter="i",
band="i",
lambdaEff=750, lambdaMin=699, lambdaMax=870,),
FilterDefinition(physical_filter="z DECam SDSS c0004 9260.0 1520.0",
abstract_filter="z",
band="z",
lambdaEff=900, lambdaMin=837, lambdaMax=1016),
FilterDefinition(physical_filter="Y DECam c0005 10095.0 1130.0",
abstract_filter="y",
band="y",
lambdaEff=1000, lambdaMin=941, lambdaMax=1080,
alias={'Y'}),
FilterDefinition(physical_filter="VR DECam c0007 6300.0 2600.0",
abstract_filter="VR",
band="VR",
lambdaEff=630, lambdaMin=490, lambdaMax=765),
FilterDefinition(physical_filter="N964 DECam c0008 9645.0 94.0",
abstract_filter="N964",
band="N964",
lambdaEff=964),
FilterDefinition(physical_filter="solid plate 0.0 0.0",
afw_name='SOLID', lambdaEff=0)
Expand Down