[Rivet-svn] rivet: Fix bugs in aopaths and plotinfo -- _ path hiding now works

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6446bca537b6
branches:  release-2-4-x
changeset: 5006:6446bca537b6
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Mar 01 22:03:07 2016 +0000
description:
Fix bugs in aopaths and plotinfo -- _ path hiding now works

diffs (truncated from 56 to 50 lines):

--- a/data/anainfo/ATLAS_2014_I1325553.info	Tue Mar 01 21:38:38 2016 +0000
+++ b/data/anainfo/ATLAS_2014_I1325553.info	Tue Mar 01 22:03:07 2016 +0000
@@ -17,9 +17,9 @@
 Energies: [7000]
 PtCuts: [100]
 Description:
-  Measurement of the inclusive jet cross-section in proton–proton collisions at a centre-of-mass energy
-  of 7 TeV using a data set corresponding to an integrated luminosity of 4.5 fb^-1 collected with the
-  ATLAS detector at the Large Hadron Collider in 2011. Jets are identified using the anti-kt algorithm
+  Measurement of the inclusive jet cross-section in proton--proton collisions at a centre-of-mass energy
+  of 7 TeV using a data set corresponding to an integrated luminosity of 4.5/fb collected with the
+  ATLAS detector at the Large Hadron Collider in 2011. Jets are identified using the anti-$k_t$ algorithm
   with radius parameter values of 0.4 and 0.6. The double-differential cross-sections are presented
   as a function of the jet transverse momentum and the jet rapidity, covering jet transverse momenta
   from 100 GeV to 2 TeV.
@@ -27,8 +27,8 @@
 BibTeX: '@article{Aad:2014vwa,
       author         = "Aad, Georges and others",
       title          = "{Measurement of the inclusive jet cross-section in
-                        proton-proton collisions at $\sqrt{s}=7$ TeV using 4.5
-                        fb$^{-1}$ of data with the ATLAS detector}",
+                        proton-proton collisions at $\sqrt{s}=7$ TeV using 4.5~fb$^{-1}$
+                        of data with the ATLAS detector}",
       collaboration  = "ATLAS Collaboration",
       year           = "2014",
       eprint         = "1410.8857",
@@ -37,4 +37,3 @@
       reportNumber   = "CERN-PH-EP-2014-155",
       SLACcitation   = "%%CITATION = ARXIV:1410.8857;%%",
 }'
-
--- a/pyext/rivet/aopaths.py	Tue Mar 01 21:38:38 2016 +0000
+++ b/pyext/rivet/aopaths.py	Tue Mar 01 22:03:07 2016 +0000
@@ -33,7 +33,10 @@
 
     def basepath(self, keepref=False):
         "Main 'Unix-like' part of the AO path, optionally including a /REF prefix"
-        return self._basepath if keepref else self._basepath.lstrip("/REF").rstrip("/")
+        p = self._basepath.rstrip("/")
+        if not keepref and p.startswith("/REF"):
+            p = p[4:]
+        return p
 
     def varpath(self, keepref=False, defaultvarid=None):
         "The basepath, plus any bracketed variation identifier"
--- a/pyext/rivet/plotinfo.py	Tue Mar 01 21:38:38 2016 +0000
+++ b/pyext/rivet/plotinfo.py	Tue Mar 01 22:03:07 2016 +0000
@@ -73,7 +73,7 @@
         plotfile = aop.basepathparts()[0] + ".plot"
         ret = {'PLOT': {}, 'SPECIAL': None, 'HISTOGRAM': {}}