[Rivet-svn] rivet: Rename xs and counter AOs to start with underscores, and ...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/db92100d3dfc
branches:  
changeset: 4841:db92100d3dfc
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 18 14:09:05 2015 +0100
description:
Rename xs and counter AOs to start with underscores, and modify rivet-cmphistos to skip AOs whose basenames start with _.

diffs (37 lines):

--- a/ChangeLog	Mon Aug 17 22:59:47 2015 +0100
+++ b/ChangeLog	Tue Aug 18 14:09:05 2015 +0100
@@ -1,3 +1,8 @@
+2015-08-18  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Rename xs and counter AOs to start with underscores, and modify
+	rivet-cmphistos to skip AOs whose basenames start with _.
+
 2015-08-17  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add writing out of cross-section and total event counter by
--- a/bin/rivet-cmphistos	Mon Aug 17 22:59:47 2015 +0100
+++ b/bin/rivet-cmphistos	Tue Aug 18 14:09:05 2015 +0100
@@ -101,6 +101,9 @@
         mchistos.setdefault(infile, {})
         analysisobjects = yoda.read(infile, patterns=opts.PATHPATTERNS, unpatterns=opts.PATHUNPATTERNS)
         for path, ao in analysisobjects.iteritems():
+            ## Conventionally don't plot data objects whose names start with an underscore
+            if os.path.basename(path).startswith("_"):
+                continue
             if path.startswith('/REF/'):
                 if not refhistos.has_key(path):
                     refhistos[path] = ao
--- a/src/Core/AnalysisHandler.cc	Mon Aug 17 22:59:47 2015 +0100
+++ b/src/Core/AnalysisHandler.cc	Tue Aug 18 14:09:05 2015 +0100
@@ -212,9 +212,9 @@
 
   vector<AnalysisObjectPtr> AnalysisHandler::getData() const {
     vector<AnalysisObjectPtr> rtn;
-    rtn.push_back( AnalysisObjectPtr(new Counter(YODA::Dbn0D(_numEvents, _sumOfWeights, _sumOfWeightsSq), "/EVTCOUNT")) );
+    rtn.push_back( AnalysisObjectPtr(new Counter(YODA::Dbn0D(_numEvents, _sumOfWeights, _sumOfWeightsSq), "/_EVTCOUNT")) );
     YODA::Scatter1D::Points pts; pts.insert(YODA::Point1D(_xs, _xserr));
-    rtn.push_back( AnalysisObjectPtr(new Scatter1D(pts, "/XSEC")) );
+    rtn.push_back( AnalysisObjectPtr(new Scatter1D(pts, "/_XSEC")) );
     foreach (const AnaHandle a, analyses()) {
       vector<AnalysisObjectPtr> aos = a->analysisObjects();
       // MSG_WARNING(a->name() << " " << aos.size());