[Rivet-svn] rivet: adding nominal weight handling.

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/cd17af54a218
branches:  multiweight
changeset: 5553:cd17af54a218
user:      Chris Pollard <cspollard at gmail.com>
date:      Tue Oct 04 12:22:43 2016 +0100
description:
adding nominal weight handling.

diffs (21 lines):

--- a/src/Core/AnalysisHandler.cc	Thu Sep 29 12:01:06 2016 +0100
+++ b/src/Core/AnalysisHandler.cc	Tue Oct 04 12:22:43 2016 +0100
@@ -310,11 +310,14 @@
           if ((*raoptr)->path().find("/TMP/") != string::npos)
               continue;
 
-          raoptr->setActiveWeightIdx(0);
-          rtn.push_back(raoptr->activeYODAPtr());
-          for (size_t iW = 1; iW < numWeights(); iW++) {
+          for (size_t iW = 0; iW < numWeights(); iW++) {
               raoptr->setActiveWeightIdx(iW);
-              (*raoptr)->setPath((*raoptr)->path() + "[" + _weightNames[iW] + "]");
+
+              // add the weight name in brackets unless we recognize a
+              // nominal weight
+              if (_weightNames[iW] != "Weight" && _weightNames[iW] != "0")
+                  (*raoptr)->setPath((*raoptr)->path() + "[" + _weightNames[iW] + "]");
+
               rtn.push_back(raoptr->activeYODAPtr());
           }
       }