[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/5d9da3d121e6
branches:  
changeset: 5229:5d9da3d121e6
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Jun 09 09:35:21 2016 +0100
description:
merged 2.4 to trunk

details:   https://rivet.hepforge.org/hg/rivet/rev/8d6fa833e7c2
branches:  
changeset: 5230:8d6fa833e7c2
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Jun 09 11:44:00 2016 +0100
description:
Fix for buildplugin when C++11 flag exists in CXX

diffs (truncated from 3430 to 50 lines):

--- a/ChangeLog	Wed May 11 23:05:38 2016 +0100
+++ b/ChangeLog	Thu Jun 09 11:44:00 2016 +0100
@@ -1,3 +1,25 @@
+2016-06-07  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Adding ATLAS 13 TeV minimum bias analysis, ATLAS_2016_I1419652.
+
+2016-05-30  Andy Buckley  <andy.buckley at cern.ch>
+
+	* pyext/rivet/util.py: Add pandoc --wrap/--no-wrap CLI detection
+	and batch conversion.
+
+	* bin/rivet: add -o as a more standard 'output' option flag alias to -H.
+
+2016-05-23  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Remove the last ref-data bin from table 16 of
+	ATLAS_2010_S8918562, due to data corruption. The corresponding
+	HepData record will be amended by ATLAS.
+
+2016-05-12  Holger Schulz  <holger.schulz at durham.ac.uk>
+
+        * Mark ATLAS_2012_I1082009 as validated after exhaustive tests with
+	Pythia8 and Sherpa in inclusive QCD mode.
+
 2016-05-11  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Specialise return error codes from the rivet script.
--- a/bin/make-plots	Wed May 11 23:05:38 2016 +0100
+++ b/bin/make-plots	Thu Jun 09 11:44:00 2016 +0100
@@ -65,7 +65,7 @@
 
 
 
-class Inputdata(object):
+class InputData(object):
 
     def __init__(self, filename):
         self.filename = filename+".dat"
@@ -76,8 +76,8 @@
         self.description = {}
         self.pathdescriptions = []
 
-        self.description['is2dim'] = False
-        f = open(filename+'.dat')
+        self.is2dim = False
+        f = open(self.filename)
         for line in f:
             m = pat_begin_block.match(line)
             if m: