[Rivet-svn] r3434 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: jmonk
Date: Tue Oct 11 14:24:13 2011
New Revision: 3434

Log:
my version of bash cannot understand |&

Modified:
   trunk/ChangeLog
   trunk/bin/rivet-buildplugin.in
   trunk/bin/root2flat

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Oct 11 01:30:13 2011	(r3433)
+++ trunk/ChangeLog	Tue Oct 11 14:24:13 2011	(r3434)
@@ -1,3 +1,7 @@
+2011-10-11  James Monk    <jmonk at cern.ch>
+  * root2flat was missing the first bin (plus spurious last bin)
+  * my version of bash does not understand the pipe syntax |& in rivet-buildplugin
+
 2011-09-30  James Monk    <jmonk at cern.ch>
   * fix bug in ATLAS_2010_S8817804 that misidentified the akt4 jets as akt6
 

Modified: trunk/bin/rivet-buildplugin.in
==============================================================================
--- trunk/bin/rivet-buildplugin.in	Tue Oct 11 01:30:13 2011	(r3433)
+++ trunk/bin/rivet-buildplugin.in	Tue Oct 11 14:24:13 2011	(r3434)
@@ -1,10 +1,10 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 ## -*- sh -*-
 ## @configure_input@
 
 ## Print help
 PROG=$(basename $0)
-tmp=$(echo $* |& egrep -- '--\<help\>|-\<h\>')
+tmp=$(echo $* | egrep -- '--\<help\>|-\<h\>')
 if test $# -lt 1 || test -n "$tmp"; then
     echo "$PROG: compilation helper for Rivet analysis plugins"
     echo
@@ -81,8 +81,8 @@
 
 ## Get and check the library name
 libname=$1
-match1=$(basename "$libname" |& egrep '^.*\.so')
-match2=$(basename "$libname" |& egrep '^Rivet.*\.so')
+match1=$(basename "$libname" | egrep '^.*\.so')
+match2=$(basename "$libname" | egrep '^Rivet.*\.so')
 if test -n "$match1"; then
     if test -z "$match2"; then
         echo "Library name '$libname' does not have the required 'Rivet*.so' name pattern" 1>&2

Modified: trunk/bin/root2flat
==============================================================================
--- trunk/bin/root2flat	Tue Oct 11 01:30:13 2011	(r3433)
+++ trunk/bin/root2flat	Tue Oct 11 14:24:13 2011	(r3434)
@@ -149,7 +149,7 @@
     X = TGraph.GetX()
     Y = TGraph.GetY()
     for ii in xrange(TGraph.GetN()):
-        i = ii + 1
+        i = ii #+ 1
         xlow  = X[i] - TGraph.GetErrorXlow(i)
         xhigh = X[i] + TGraph.GetErrorXhigh(i)
         y     = Y[i]