Merge pull request #158 from lsst/tickets/DM-24570

Change metadata keys to uppercase standard.
lsst · Apr 23, 2020 · 886f805 · 886f805
2 parents 28bbdb8 + 970df60
commit 886f805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/ApertureFlux.cc b/src/ApertureFlux.cc
@@ -23,7 +23,7 @@
 
 #include <numeric>
 
-#include "boost/algorithm/string/replace.hpp"
+#include "boost/algorithm/string.hpp"
 
 #include "ndarray/eigen.h"
 
@@ -75,7 +75,9 @@ ApertureFluxAlgorithm::ApertureFluxAlgorithm(Control const &ctrl, std::string co
         : _ctrl(ctrl), _centroidExtractor(schema, name) {
     _keys.reserve(ctrl.radii.size());
     for (std::size_t i = 0; i < ctrl.radii.size(); ++i) {
-        metadata.add(name + "_radii", ctrl.radii[i]);
+        std::string upperName(name);
+        boost::to_upper(upperName);
+        metadata.add(upperName + "_RADII", ctrl.radii[i]);
         std::string prefix = ApertureFluxAlgorithm::makeFieldPrefix(name, ctrl.radii[i]);
         std::string doc = (boost::format("instFlux within %f-pixel aperture") % ctrl.radii[i]).str();
         _keys.push_back(Keys(schema, prefix, doc, ctrl.radii[i] <= ctrl.maxSincRadius));

diff --git a/tests/test_ApertureFlux.py b/tests/test_ApertureFlux.py
@@ -172,7 +172,7 @@ def testSingleFramePlugin(self):
         task = self.makeSingleFrameMeasurementTask(config=config, algMetadata=algMetadata)
         exposure, catalog = self.dataset.realize(10.0, task.schema, randomSeed=0)
         task.run(catalog, exposure)
-        radii = algMetadata.getArray("%s_radii" % (baseName,))
+        radii = algMetadata.getArray("%s_RADII" % (baseName.upper(),))
         self.assertEqual(list(radii), list(ctrl.radii))
         for record in catalog:
             lastFlux = 0.0
@@ -223,7 +223,7 @@ def testForcedPlugin(self):
         baseName = "base_CircularApertureFlux"
         algMetadata = lsst.daf.base.PropertyList()
         task = self.makeForcedMeasurementTask(baseName, algMetadata=algMetadata)
-        radii = algMetadata.getArray("%s_radii" % (baseName,))
+        radii = algMetadata.getArray("%s_RADII" % (baseName.upper(),))
         measWcs = self.dataset.makePerturbedWcs(self.dataset.exposure.getWcs(), randomSeed=1)
         measDataset = self.dataset.transform(measWcs)
         exposure, truthCatalog = measDataset.realize(10.0, measDataset.makeMinimalSchema(), randomSeed=1)