Drop custom translation key handler for one in obs_base.

python/lsst/obs/subaru/instrument.py

@@ -35,7 +35,7 @@
                              TIMESPAN_MIN)
 from lsst.daf.butler.core.utils import getFullTypeName
 from lsst.obs.base import Instrument, addUnboundedCalibrationLabel
-from lsst.obs.base.gen2to3 import TranslatorFactory, KeyHandler
+from lsst.obs.base.gen2to3 import TranslatorFactory, KeyHandler, PhysicalToAbstractFilterKeyHandler
 
 from ..hsc.hscPupil import HscPupilFactory
 from ..hsc.hscFilters import HSC_FILTER_DEFINITIONS
@@ -46,22 +46,6 @@
 log = logging.getLogger(__name__)
 
 
-class _HscAbstractFilterKeyHandler(KeyHandler):
-    """KeyHandler for HSC filter keys that should be mapped to AbstractFilters.
-    """
-
-    __slots__ = ("_map",)
-
-    def __init__(self):
-        super().__init__("abstract_filter")
-        self._map = {d.physical_filter: d.abstract_filter for d in HSC_FILTER_DEFINITIONS
-                     if d.physical_filter is not None}
-
-    def extract(self, gen2id, skyMap, skyMapName, datasetTypeName):
-        physical = gen2id["filter"]
-        return self._map.get(physical, physical)
-
-
 class HyperSuprimeCam(Instrument):
     """Gen3 Butler specialization class for Subaru's Hyper Suprime-Cam.
     """
@@ -286,6 +270,6 @@ def makeDataIdTranslatorFactory(self) -> TranslatorFactory:
         factory.addGenericInstrumentRules(self.getName())
         # Translate Gen2 `filter` to abstract_filter if it hasn't been consumed
         # yet and gen2keys includes tract.
-        factory.addRule(_HscAbstractFilterKeyHandler(), instrument="HSC", gen2keys=("filter", "tract"),
-                        consume=("filter",))
+        factory.addRule(PhysicalToAbstractFilterKeyHandler(self.filterDefinitions),
+                        instrument=self.getName(), gen2keys=("filter", "tract"), consume=("filter",))
         return factory