Use gen3 bands properly

Switch to using afw_name to specify the old-style filter alias u2, u3 etc.
lsst · Feb 9, 2021 · 6d3605a · 6d3605a
1 parent ceb8a03
commit 6d3605a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/python/lsst/obs/cfht/cfhtFilters.py b/python/lsst/obs/cfht/cfhtFilters.py
@@ -33,57 +33,63 @@
                      band="u",
                      lambdaEff=374, lambdaMin=336, lambdaMax=412),
     FilterDefinition(physical_filter="u.MP9302",
-                     band="u2",
-                     alias={"u2"},
+                     band="u",
+                     afw_name="u2",
                      lambdaEff=354, lambdaMin=310, lambdaMax=397),
     FilterDefinition(physical_filter="u.MP9303",
-                     band="u3",
+                     band="u",
+                     afw_name="u3",
                      lambdaEff=395, lambdaMin=390, lambdaMax=400),
     FilterDefinition(physical_filter="g.MP9401",
                      band="g",
                      lambdaEff=487, lambdaMin=414, lambdaMax=560),
     FilterDefinition(physical_filter="g.MP9402",
-                     band="g2",
-                     alias={"g2"},
+                     band="g",
+                     afw_name="g2",
                      lambdaEff=472, lambdaMin=396, lambdaMax=548),
     FilterDefinition(physical_filter="g.MP9501",
-                     band="g3",
+                     band="g",
+                     afw_name="g3",
                      lambdaEff=501, lambdaMin=495, lambdaMax=506),
     FilterDefinition(physical_filter="g.MP9502",
-                     band="g4",
+                     band="g",
+                     afw_name="g4",
                      lambdaEff=511, lambdaMin=506, lambdaMax=516),
     FilterDefinition(physical_filter="r.MP9601",
                      band="r",
                      lambdaEff=628, lambdaMin=567, lambdaMax=689),
     FilterDefinition(physical_filter="r.MP9602",
-                     band="r2",
-                     alias={"r2"},
+                     band="r",
+                     afw_name="r2",
                      lambdaEff=640, lambdaMin=566, lambdaMax=714),
     FilterDefinition(physical_filter="r.MP9603",
-                     band="r3",
+                     band="r",
+                     afw_name="r3",
                      lambdaEff=659, lambdaMin=654, lambdaMax=664),
     FilterDefinition(physical_filter="r.MP9604",
-                     band="r4",
+                     band="r",
+                     afw_name="r4",
                      lambdaEff=672, lambdaMin=666, lambdaMax=677),
     FilterDefinition(physical_filter="r.MP9605",
-                     band="r5",
+                     band="r",
+                     afw_name="r5",
                      lambdaEff=611, lambdaMin=400, lambdaMax=821),
     FilterDefinition(physical_filter="i.MP9701",
                      band="i",
                      lambdaEff=778, lambdaMin=702, lambdaMax=853,),
     FilterDefinition(physical_filter="i.MP9702",
-                     band="i2",
-                     alias={"i2"},
+                     band="i",
+                     afw_name="i2",
                      lambdaEff=764, lambdaMin=684, lambdaMax=845),
     FilterDefinition(physical_filter="i.MP9703",
-                     band="i3",
-                     alias={"i3"},
+                     band="i",
+                     afw_name="i",
                      lambdaEff=776, lambdaMin=696, lambdaMax=857,),
     FilterDefinition(physical_filter="z.MP9801",
                      band="z",
                      lambdaEff=1170, lambdaMin=827, lambdaMax=1514),
     FilterDefinition(physical_filter="z.MP9901",
-                     band="z2",
-                     alias={"z2"},
+                     band="z",
+                     afw_name="z2",
                      lambdaEff=926, lambdaMin=849, lambdaMax=1002),
 )
diff --git a/tests/test_ingest.py b/tests/test_ingest.py
@@ -43,7 +43,7 @@ class MegaPrimeIngestTestCase(IngestTestBase, lsst.utils.tests.TestCase):
     ingestDir = os.path.dirname(__file__)
     instrumentClassName = "lsst.obs.cfht.MegaPrime"
     rawIngestTask = "lsst.obs.cfht.MegaPrimeRawIngestTask"
-    filterLabel = lsst.afw.image.FilterLabel(physical="i.MP9702", band="i2")
+    filterLabel = lsst.afw.image.FilterLabel(physical="i.MP9702", band="i")
 
     @property
     def file(self):