End usage of FilterProperty, as per RFC-730.

lsst · Nov 9, 2020 · 1919356 · 1919356
1 parent eae50cf
commit 1919356
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/test_getInstcal.py b/tests/test_getInstcal.py
@@ -61,7 +61,7 @@ def testInstcal(self):
         self.assertEqual(exp.getWidth(), self.size[0])
         self.assertEqual(exp.getHeight(), self.size[1])
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
-        self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)
+        self.assertEqual(exp.getFilter().getName(), self.filter)
         self.assertTrue(exp.hasWcs())
         magZero = 2.5 * math.log10(exp.getPhotoCalib().getInstFluxAtZeroMagnitude())
         self.assertAlmostEqual(magZero, 28.957)

diff --git a/tests/test_getRaw.py b/tests/test_getRaw.py
@@ -93,7 +93,7 @@ def testRaw(self):
         self.assertEqual(exp.getWidth(), self.size[0])
         self.assertEqual(exp.getHeight(), self.size[1])
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
-        self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)
+        self.assertEqual(exp.getFilter().getName(), self.filter)
         self.assertTrue(exp.hasWcs())
 
         # Metadata which should have been copied from zeroth extension.
@@ -142,7 +142,7 @@ def testFlat(self):
         print("detector id: %s" % exp.getDetector().getId())
         print("filter: %s" % self.filter)
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
-        self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)
+        self.assertEqual(exp.getFilter().getName(), self.filter)
         self.assertTrue(exp.hasWcs())
 
     def testFringe(self):
@@ -152,7 +152,7 @@ def testFringe(self):
         print("detector id: %s" % exp.getDetector().getId())
         print("filter: %s" % self.filter)
         self.assertEqual(exp.getDetector().getId(), self.dataId["ccdnum"])
-        self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)
+        self.assertEqual(exp.getFilter().getName(), self.filter)
 
     def testDefect(self):
         """Test retrieval of defect list"""