tickets/DM-7510: add support for HSC-R2 filter

config/hsc/colorterms.py

@@ -13,6 +13,7 @@
     "sdss*": ColortermDict(data={
         'g':    Colorterm(primary="g", secondary="r", c0=-0.00816446, c1=-0.08366937, c2=-0.00726883),
         'r':    Colorterm(primary="r", secondary="i", c0= 0.00231810, c1= 0.01284177, c2=-0.03068248),
+        'r2':   Colorterm(primary="r", secondary="i", c0= 0.00074087, c1=-0.00830543, c2=-0.02848420),
         'i':    Colorterm(primary="i", secondary="z", c0= 0.00130204, c1=-0.16922042, c2=-0.01374245),
         'i2':   Colorterm(primary="i", secondary="z", c0= 0.00124676, c1=-0.20739606, c2=-0.01067212),
         'z':    Colorterm(primary="z", secondary="i", c0=-0.00680620, c1= 0.01353969, c2= 0.01479369),
@@ -23,6 +24,7 @@
     "ps1*": ColortermDict(data={
         'g':    Colorterm(primary="g", secondary="r", c0= 0.00730066, c1= 0.06508481, c2=-0.01510570),
         'r':    Colorterm(primary="r", secondary="i", c0= 0.00279757, c1= 0.02093734, c2=-0.01877566),
+        'r2':   Colorterm(primary="r", secondary="i", c0= 0.00117690, c1= 0.00003996, c2=-0.01667794),
         'i':    Colorterm(primary="i", secondary="z", c0= 0.00166891, c1=-0.13944659, c2=-0.03034094),
         'i2':   Colorterm(primary="i", secondary="z", c0= 0.00180361, c1=-0.18483562, c2=-0.02675511),
         'z':    Colorterm(primary="z", secondary="y", c0=-0.00907517, c1=-0.28840221, c2=-0.00316369),

config/hsc/filterMap.py

@@ -1,3 +1,3 @@
 for source, target in [("N921", 'z'), ("N816", 'i'), ("N515", 'g'), ("N387", 'g'), ("N1010", 'z'),
-                       ("i2", 'i'),]:
+                       ("i2", 'i'), ("r2", "r"),]:
     config.filterMap[source] = target

config/hsc/mergeCoaddDetections.py

@@ -1,3 +1,2 @@
-config.priorityList = ["HSC-I2", "HSC-I", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G", "NB0921", "NB0816", "NB1010",
-                       "NB0387", "NB0515",]
-
+config.priorityList = ["HSC-I2", "HSC-I", "HSC-R2", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G", "NB0921", "NB0816",
+                       "NB1010", "NB0387", "NB0515",]

config/hsc/mergeCoaddMeasurements.py

@@ -1,3 +1,2 @@
-config.priorityList = ["HSC-I2", "HSC-I", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G", "NB0921", "NB0816", "NB1010",
-                       "NB0387", "NB0515",]
-
+config.priorityList = ["HSC-I2", "HSC-I", "HSC-R2", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G", "NB0921", "NB0816",
+                       "NB1010", "NB0387", "NB0515",]

python/lsst/obs/hsc/hscMapper.py

@@ -90,6 +90,7 @@ def __init__(self, **kwargs):
         afwImageUtils.defineFilter(name='I945', lambdaEff=945, alias=['IB0945'])
         afwImageUtils.defineFilter(name='N973', lambdaEff=973, alias=['NB0973'])
         afwImageUtils.defineFilter(name='i2', lambdaEff=775, alias=['HSC-I2'])
+        afwImageUtils.defineFilter(name='r2', lambdaEff=623, alias=['HSC-R2'])
         #
         # self.filters is used elsewhere, and for now we'll set it
         #
@@ -100,6 +101,7 @@ def __init__(self, **kwargs):
         for f in [
             "HSC-G",
             "HSC-R",
+            "HSC-R2",
             "HSC-I",
             "HSC-I2",
             "HSC-Z",

tests/testColorterms.py

@@ -70,7 +70,7 @@ def testSdssColorterms(self):
     def testPs1Colorterms(self):
         """Test that the colorterm libraries are formatted correctly"""
         ps1Bands = ["g", "r", "i", "z", "y"]
-        hscBands = ["g", "r", "i", "i2", "z", "y", "N816", "N921"]
+        hscBands = ["g", "r", "r2", "i", "i2", "z", "y", "N816", "N921"]
         for band in hscBands:
             ct = self.photoCalConf.colorterms.getColorterm(band, photoCatName="ps1")  # exact match
             self.assertIn(ct.primary, ps1Bands)