Merge pull request #339 from lsst/tickets/DM-28088

DM-28088: Replace short filter names with physical filter names
lsst · Feb 5, 2021 · 8817bd1 · 8817bd1
2 parents 38c4cc2 + 0647a24
commit 8817bd1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 34 deletions.
diff --git a/config/fgcmBuildStars.py b/config/fgcmBuildStars.py
@@ -8,22 +8,15 @@
 # The mapping from HSC short filter name to FGCM "band".  This mapping
 # ensures that stars observed in HSC-R + HSC-R2 can be matched, and
 # HSC-I + HSC-I2 can be matched.
-config.filterMap = {'g': 'g', 'r': 'r', 'r2': 'r', 'i': 'i', 'i2': 'i',
-                    'z': 'z', 'y': 'y',
-                    'N387': 'N387', 'N816': 'N816', 'N921': 'N921',
-                    'N1010': 'N1010'}
+from lsst.obs.hsc.hscFilters import HSC_FILTER_DEFINITIONS
+config.physicalFilterMap = HSC_FILTER_DEFINITIONS.physical_to_band
 config.primaryBands = ('i', 'r', 'g', 'z', 'y', 'N387', 'N816', 'N921', 'N1010')
 config.doSubtractLocalBackground = True
 
 config.fgcmLoadReferenceCatalog.refObjLoader.ref_dataset_name = 'ps1_pv3_3pi_20170110'
-# This is the mapping from HSC short filter name to the closest PS1 filter from
-# the reference catalog.  PS1 does not have narrow-band filters.
-config.fgcmLoadReferenceCatalog.refFilterMap = {'g': 'g', 'r': 'r', 'r2': 'r',
-                                                'i': 'i', 'i2': 'i', 'z': 'z', 'y': 'y',
-                                                'N387': 'g', 'N816': 'i', 'N921': 'z',
-                                                'N1010': 'y'}
-config.fgcmLoadReferenceCatalog.applyColorTerms = True
 hscConfigDir = os.path.join(os.path.dirname(__file__))
+config.fgcmLoadReferenceCatalog.load(os.path.join(hscConfigDir, 'filterMap.py'))
+config.fgcmLoadReferenceCatalog.applyColorTerms = True
 config.fgcmLoadReferenceCatalog.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
 config.fgcmLoadReferenceCatalog.referenceSelector.doSignalToNoise = True
 # Choose reference catalog signal-to-noise based on the PS1 i-band.

diff --git a/config/fgcmBuildStarsTable.py b/config/fgcmBuildStarsTable.py
@@ -8,22 +8,15 @@
 # The mapping from HSC short filter name to FGCM "band".  This mapping
 # ensures that stars observed in HSC-R + HSC-R2 can be matched, and
 # HSC-I + HSC-I2 can be matched.
-config.filterMap = {'g': 'g', 'r': 'r', 'r2': 'r', 'i': 'i', 'i2': 'i',
-                    'z': 'z', 'y': 'y',
-                    'N387': 'N387', 'N816': 'N816', 'N921': 'N921',
-                    'N1010': 'N1010'}
+from lsst.obs.hsc.hscFilters import HSC_FILTER_DEFINITIONS
+config.physicalFilterMap = HSC_FILTER_DEFINITIONS.physical_to_band
 config.primaryBands = ('i', 'r', 'g', 'z', 'y', 'N387', 'N816', 'N921', 'N1010')
 config.doSubtractLocalBackground = True
 
 config.fgcmLoadReferenceCatalog.refObjLoader.ref_dataset_name = 'ps1_pv3_3pi_20170110'
-# This is the mapping from HSC short filter name to the closest PS1 filter from
-# the reference catalog.  PS1 does not have narrow-band filters.
-config.fgcmLoadReferenceCatalog.refFilterMap = {'g': 'g', 'r': 'r', 'r2': 'r',
-                                                'i': 'i', 'i2': 'i', 'z': 'z', 'y': 'y',
-                                                'N387': 'g', 'N816': 'i', 'N921': 'z',
-                                                'N1010': 'y'}
-config.fgcmLoadReferenceCatalog.applyColorTerms = True
 hscConfigDir = os.path.join(os.path.dirname(__file__))
+config.fgcmLoadReferenceCatalog.load(os.path.join(hscConfigDir, 'filterMap.py'))
+config.fgcmLoadReferenceCatalog.applyColorTerms = True
 config.fgcmLoadReferenceCatalog.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
 config.fgcmLoadReferenceCatalog.referenceSelector.doSignalToNoise = True
 # Choose reference catalog signal-to-noise based on the PS1 i-band.

diff --git a/config/fgcmFitCycle.py b/config/fgcmFitCycle.py
@@ -3,10 +3,8 @@
 config.outfileBase = 'fgcmHscCalibrations'
 config.bands = ['N387', 'g', 'r', 'i', 'N816', 'z', 'N921', 'y', 'N1010']
 config.fitBands = ['N387', 'g', 'r', 'i', 'N816', 'z', 'N921', 'y', 'N1010']
-config.filterMap = {'g': 'g', 'r': 'r', 'r2': 'r', 'i': 'i', 'i2': 'i',
-                    'z': 'z', 'y': 'y',
-                    'N387': 'N387', 'N816': 'N816', 'N921': 'N921',
-                    'N1010': 'N1010'}
+from lsst.obs.hsc.hscFilters import HSC_FILTER_DEFINITIONS
+config.physicalFilterMap = HSC_FILTER_DEFINITIONS.physical_to_band
 config.maxIterBeforeFinalCycle = 75
 config.nCore = 4
 config.cycleNumber = 0

diff --git a/config/fgcmMakeLut.py b/config/fgcmMakeLut.py
@@ -1,12 +1,17 @@
-# Filter names to build LUT ('short' names)
-config.filterNames = ('g', 'r', 'r2', 'i', 'i2', 'z', 'y',
-                      'N387', 'N816', 'N921', 'N1010')
+# List of filters to put into the look-up table (LUT)
+config.physicalFilters = ['HSC-G', 'HSC-R', 'HSC-R2', 'HSC-I', 'HSC-I2',
+                          'HSC-Z', 'HSC-Y', 'NB0387', 'NB0816', 'NB0921',
+                          'NB1010']
 
-# Standard filterNames ('short' names)
-# These settings will put both "r" and "r2" filters on the
-# "r2" standard, and similar for "i" and "i2".
-config.stdFilterNames = ('g', 'r2', 'r2', 'i2', 'i2', 'z', 'y',
-                         'N387', 'N816', 'N921', 'N1010')
+# Override mapping from physical filter labels to 'standard' physical
+# filter labels. The 'standard' physical filter defines the transmission
+# curve that the FGCM standard bandpass will be based on.
+# Any filter not listed here will be mapped to
+# itself (e.g. HSC-G->HSC-G).  These overrides specify that HSC-R should
+# be mapped onto the HSC-R2 system and HSC-I should be mapped onto
+# the HSC-I2 system.
+config.stdPhysicalFilterOverrideMap = {'HSC-R': 'HSC-R2',
+                                       'HSC-I': 'HSC-I2'}
 
 # FGCM name or filename of precomputed atmospheres
 config.atmosphereTableName = 'fgcm_atm_subaru3'