Use upper-case instrument name to match verify_metrics convention.

lsst-dm · Aug 2, 2018 · 1d1f9b4 · 1d1f9b4
1 parent 4ca0a5b
commit 1d1f9b4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/python/lsst/validate/drp/validate.py b/python/lsst/validate/drp/validate.py
@@ -214,14 +214,14 @@ def runOneRepo(repo, dataIds=None, metrics=None, outputPrefix='', verbose=False,
 
     def extract_instrument_from_repo(repo):
         """Extract the last part of the mapper name from a Butler repo.
-        'lsst.obs.lsstSim.lsstSimMapper.LsstSimMapper' -> 'lsstSim'
-        'lsst.obs.cfht.megacamMapper.MegacamMapper' -> 'cfht'
-        'lsst.obs.decam.decamMapper.DecamMapper' -> 'decam'
-        'lsst.obs.hsc.hscMapper.HscMapper' -> 'hsc'
+        'lsst.obs.lsstSim.lsstSimMapper.LsstSimMapper' -> 'LSSTSIM'
+        'lsst.obs.cfht.megacamMapper.MegacamMapper' -> 'CFHT'
+        'lsst.obs.decam.decamMapper.DecamMapper' -> 'DECAM'
+        'lsst.obs.hsc.hscMapper.HscMapper' -> 'HSC'
         """
         mapper_class = Butler.getMapperClass(repo)
         instrument = mapper_class.getCameraName()
-        return instrument
+        return instrument.upper()
 
     if instrument is None:
         instrument = extract_instrument_from_repo(repo)