Merge pull request #190 from lsst/tickets/DM-22550

DM-22550: Reset filters before defining new filters
lsst · Dec 16, 2019 · e91d8c4 · e91d8c4
2 parents 608b899 + ba315b9
commit e91d8c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/python/lsst/obs/base/fitsRawFormatterBase.py b/python/lsst/obs/base/fitsRawFormatterBase.py
@@ -42,6 +42,7 @@ class FitsRawFormatterBase(FitsExposureFormatter, metaclass=ABCMeta):
     """
 
     def __init__(self, *args, **kwargs):
+        self.filterDefinitions.reset()
         self.filterDefinitions.defineFilters()
         super().__init__(*args, **kwargs)
 

diff --git a/python/lsst/obs/base/instrument.py b/python/lsst/obs/base/instrument.py
@@ -50,6 +50,7 @@ def filterDefinitions(self):
         return None
 
     def __init__(self, *args, **kwargs):
+        self.filterDefinitions.reset()
         self.filterDefinitions.defineFilters()
 
     @classmethod

diff --git a/tests/test_instrument.py b/tests/test_instrument.py
@@ -25,21 +25,15 @@
 import lsst.utils
 from lsst.daf.butler.core import Registry
 from lsst.daf.butler.core.butlerConfig import ButlerConfig
-from lsst.obs.base import Instrument
+from lsst.obs.base import Instrument, FilterDefinitionCollection
 
 """Tests of the Instrument class.
 """
 
 
 class DummyCam(Instrument):
 
-    class FilterDefinitions:
-        """Stopgap until Instrument is moved into obs_base and we can use the
-        real FilterDefinitions there.
-        """
-        def defineFilters(self):
-            pass
-    filterDefinitions = FilterDefinitions()
+    filterDefinitions = FilterDefinitionCollection()
 
     @classmethod
     def getName(cls):