[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/89f572acaa99
branches:  release-2-5-x
changeset: 5550:89f572acaa99
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 03 14:18:42 2016 +0100
description:
closed mis-merge

details:   https://rivet.hepforge.org/hg/rivet/rev/7181e7acdc1a
branches:  release-2-5-x
changeset: 5551:7181e7acdc1a
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 03 14:19:40 2016 +0100
description:
correct 2-5-x head after mismerge

diffs (truncated from 845 to 50 lines):

--- a/configure.ac	Mon Oct 03 13:46:32 2016 +0100
+++ b/configure.ac	Mon Oct 03 14:19:40 2016 +0100
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Rivet],[trunk],[rivet at projects.hepforge.org],[Rivet])
+AC_INIT([Rivet],[2.5.3-pre],[rivet at projects.hepforge.org],[Rivet])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
--- a/data/anainfo/MC_CENTRALITY.info	Mon Oct 03 13:46:32 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-Name: MC_CENTRALITY
-Summary: Template analysis for using CentralityHistogram
-Status: UNVALIDATED
-Authors:
- - Leif Lönnblad <leif.lonnblad at thep.lu.se>
-NumEvents: 50000
-RunInfo: Any!
-Description:
-   Template analysis for using CentralityHistogram for dynamically
-   determining centrality intervals using summed eT in the forward region.
--- a/data/anainfo/Makefile.am	Mon Oct 03 13:46:32 2016 +0100
+++ b/data/anainfo/Makefile.am	Mon Oct 03 14:19:40 2016 +0100
@@ -310,7 +310,6 @@
   LHCB_2014_I1281685.info \
   LHCB_2015_I1333223.info \
   LHCF_2012_I1115479.info \
-  MC_CENTRALITY.info \
   MC_DIPHOTON.info \
   MC_ELECTRONS.info \
   MC_GENERIC.info \
--- a/data/plotinfo/MC_CENTRALITY.plot	Mon Oct 03 13:46:32 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-# BEGIN PLOT /MC_CENTRALITY/ETfwd
-Title=Sum $E_T$ distribution
-XLabel=$\sum E_T$ 
-YLabel=$1/\sigma \; \mathrm{d}\sigma/\mathrm{d}\sum E_T$
-# END PLOT
-
-# BEGIN PLOT /MC_CENTRALITY/EtaAll
-Title=Charged pseudo-rapidity distribution
-XLabel=$\eta$ 
-YLabel=$1/\sigma \; \mathrm{d}\sigma/\mathrm{d}\eta$
-# END PLOT
-
-# BEGIN PLOT /MC_CENTRALITY/EtaC95