Add new ValsFromRange function: like MassesFromRange but supports -ve numbers

 - fixes #606

Author: ajgilbert

CombineHarvester/CombineTools/interface/Utilities.h

@@ -116,9 +116,52 @@ std::vector<std::vector<unsigned>> GenerateCombinations(
 
 std::vector<std::string> ParseFileLines(std::string const& file_name);
 
+/**
+ * Generate a vector of mass values using ranges and intervals specified in a
+ * string
+ *
+ * The input string should be of the format:
+ *
+ *     m1-m2:r1,m3,m4,m5-m6:r2,...
+ *
+ * where mi and ri must both be positive. A term like mi-mj:r (where mi must
+ * be < mj) genrates masses starting at mi and increasing by an interval r up
+ * to mj.
+ *
+ * This function returns a vector of ordered mass values converted to strings.
+ *
+ * \note Use the function ch::ValsFromRange if you need to include negative
+ * numbers - this uses a different syntax for the ranges so doesn't suffer
+ * from the amiguity of the `-` sign
+ *
+ * @param input The input string to decode
+ * @param fmt The format specifier for converting floating-point mass values
+ * to strings
+ */
 std::vector<std::string> MassesFromRange(std::string const& input,
                                          std::string const& fmt = "%.0f");
 
+/**
+ * Generate a vector of values using ranges and intervals specified in a
+ * string
+ *
+ * The input string should be of the format:
+ *
+ *     m1:m2|r1,m3,m4,m5:m6|r2,...
+ *
+ * where mi and ri can be positive or negative. A term like mi-mj:r (where mi
+ * must be < mj) genrates values starting at mi and increasing by an interval
+ * r up to mj.
+ *
+ * This function returns a vector of ordered values converted to strings.
+ *
+ * @param input The input string to decode
+ * @param fmt The format specifier for converting floating-point values to
+ * strings
+ */
+std::vector<std::string> ValsFromRange(std::string const& input,
+                                       std::string const& fmt = "%.0f");
+
 bool HasNegativeBins(TH1 const* h);
 
 void ZeroNegativeBins(TH1 *h);

CombineHarvester/CombineTools/src/Utilities.cc

@@ -252,6 +252,38 @@ std::vector<std::string> MassesFromRange(std::string const& input,
   return result;
 }
 
+std::vector<std::string> ValsFromRange(std::string const& input,
+                                       std::string const& fmt) {
+  std::set<double> mass_set;
+  std::vector<std::string> tokens;
+  boost::split(tokens, input, boost::is_any_of(","));
+  for (auto const& t : tokens) {
+    std::vector<std::string> sub_tokens;
+    boost::split(sub_tokens, t, boost::is_any_of(":|"));
+    if (sub_tokens.size() == 1) {
+      double mass_val = boost::lexical_cast<double>(sub_tokens[0]);
+      mass_set.insert(mass_val);
+    } else if (sub_tokens.size() == 3) {
+      double lo = boost::lexical_cast<double>(sub_tokens[0]);
+      double hi = boost::lexical_cast<double>(sub_tokens[1]);
+      double step = boost::lexical_cast<double>(sub_tokens[2]);
+      if (hi <= lo)
+        throw std::runtime_error(
+            "[ValsFromRange] High mass is smaller than low mass!");
+      double start = lo;
+      while (start < hi + 1E-4) {
+        mass_set.insert(start);
+        start += step;
+      }
+    }
+  }
+  std::vector<std::string> result;
+  for (auto const& m : mass_set) {
+    result.push_back((boost::format(fmt) % m).str());
+  }
+  return result;
+}
+
 boost::filesystem::path make_relative(boost::filesystem::path p_from,
                                       boost::filesystem::path p_to) {
   p_from = boost::filesystem::absolute(p_from);

CombineHarvester/CombineTools/test/SMLegacyExample.cpp

@@ -94,7 +94,7 @@ int main() {
       {0, "tauTau_1jet_high_mediumhiggs"}, {1, "tauTau_1jet_high_highhiggs"},
       {2, "tauTau_vbf"}};
 
-  vector<string> masses = ch::MassesFromRange("110-145:5");
+  vector<string> masses = ch::ValsFromRange("110:145|5");
 
   cout << ">> Creating processes and observations...\n";
   for (string era : {"7TeV", "8TeV"}) {