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 #315

Merged
merged 1 commit into from
Sep 25, 2020
Merged

DM-26738: Rename abstract_filter to band #315

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
48 changes: 24 additions & 24 deletions python/lsst/obs/hsc/hscFilters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,61 +31,61 @@
# least some object IDs (e.g. on coadds) and changing the order will
# invalidate old objIDs
HSC_FILTER_DEFINITIONS = FilterDefinitionCollection(
FilterDefinition(abstract_filter="UNRECOGNISED", physical_filter="NONE", lambdaEff=0,
FilterDefinition(band="UNRECOGNISED", physical_filter="NONE", lambdaEff=0,
alias=["NONE", "None", "Unrecognised", "UNRECOGNISED",
"Unrecognized", "UNRECOGNIZED", "NOTSET"]),
FilterDefinition(physical_filter="HSC-G",
abstract_filter="g",
band="g",
lambdaEff=477, alias={'W-S-G+'}),
FilterDefinition(physical_filter="HSC-R",
abstract_filter="r",
band="r",
lambdaEff=623, alias={'W-S-R+'}),
FilterDefinition(physical_filter="ENG-R1",
abstract_filter="r1",
band="r1",
lambdaEff=623, alias={'109'}),
FilterDefinition(physical_filter="HSC-I",
abstract_filter="i",
band="i",
lambdaEff=775, alias={'W-S-I+'}),
FilterDefinition(physical_filter="HSC-Z",
abstract_filter="z",
band="z",
lambdaEff=925, alias={'W-S-Z+'}),
FilterDefinition(physical_filter="HSC-Y",
abstract_filter="y",
band="y",
lambdaEff=990, alias={'W-S-ZR'}),
FilterDefinition(physical_filter="NB0387",
abstract_filter='N387', lambdaEff=387),
band='N387', lambdaEff=387),
FilterDefinition(physical_filter="NB0515",
abstract_filter='N515', lambdaEff=515),
band='N515', lambdaEff=515),
FilterDefinition(physical_filter="NB0656",
abstract_filter='N656', lambdaEff=656),
band='N656', lambdaEff=656),
FilterDefinition(physical_filter="NB0816",
abstract_filter='N816', lambdaEff=816),
band='N816', lambdaEff=816),
FilterDefinition(physical_filter="NB0921",
abstract_filter='N921', lambdaEff=921),
band='N921', lambdaEff=921),
FilterDefinition(physical_filter="NB1010",
abstract_filter='N1010', lambdaEff=1010),
band='N1010', lambdaEff=1010),
FilterDefinition(physical_filter="SH",
abstract_filter='SH', lambdaEff=0),
band='SH', lambdaEff=0),
FilterDefinition(physical_filter="PH",
abstract_filter='PH', lambdaEff=0),
band='PH', lambdaEff=0),
FilterDefinition(physical_filter="NB0527",
abstract_filter='N527', lambdaEff=527),
band='N527', lambdaEff=527),
FilterDefinition(physical_filter="NB0718",
abstract_filter='N718', lambdaEff=718),
band='N718', lambdaEff=718),
FilterDefinition(physical_filter="IB0945",
abstract_filter='I945', lambdaEff=945),
band='I945', lambdaEff=945),
FilterDefinition(physical_filter="NB0973",
abstract_filter='N973', lambdaEff=973),
band='N973', lambdaEff=973),
FilterDefinition(physical_filter="HSC-I2",
abstract_filter="i",
band="i",
afw_name='i2', lambdaEff=775),
FilterDefinition(physical_filter="HSC-R2",
abstract_filter="r",
band="r",
afw_name='r2', lambdaEff=623),
FilterDefinition(physical_filter="NB0468",
abstract_filter='N468', lambdaEff=468),
band='N468', lambdaEff=468),
FilterDefinition(physical_filter="NB0926",
abstract_filter='N926', lambdaEff=926),
band='N926', lambdaEff=926),
FilterDefinition(physical_filter="NB0400",
abstract_filter='N400', lambdaEff=400),
band='N400', lambdaEff=400),
)
6 changes: 3 additions & 3 deletions python/lsst/obs/subaru/_instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
CollectionType, Timespan)
from lsst.daf.butler.core.utils import getFullTypeName
from lsst.obs.base import Instrument, addUnboundedCalibrationLabel
from lsst.obs.base.gen2to3 import TranslatorFactory, PhysicalToAbstractFilterKeyHandler
from lsst.obs.base.gen2to3 import TranslatorFactory, PhysicalFilterToBandKeyHandler

from ..hsc.hscPupil import HscPupilFactory
from ..hsc.hscFilters import HSC_FILTER_DEFINITIONS
Expand Down Expand Up @@ -275,8 +275,8 @@ def makeDataIdTranslatorFactory(self) -> TranslatorFactory:
# Docstring inherited from lsst.obs.base.Instrument.
factory = TranslatorFactory()
factory.addGenericInstrumentRules(self.getName())
# Translate Gen2 `filter` to abstract_filter if it hasn't been consumed
# Translate Gen2 `filter` to band if it hasn't been consumed
# yet and gen2keys includes tract.
factory.addRule(PhysicalToAbstractFilterKeyHandler(self.filterDefinitions),
factory.addRule(PhysicalFilterToBandKeyHandler(self.filterDefinitions),
instrument=self.getName(), gen2keys=("filter", "tract"), consume=("filter",))
return factory