[Rivet-svn] rivet: Merge from 2-6-x: fixes and new analyses

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/fe1471c34e69
branches:  multiweight
changeset: 6345:fe1471c34e69
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Sat Jun 23 15:10:31 2018 +0100
description:
Merge from 2-6-x: fixes and new analyses

diffs (truncated from 80942 to 50 lines):

--- a/ChangeLog	Thu May 24 10:52:45 2018 +0100
+++ b/ChangeLog	Sat Jun 23 15:10:31 2018 +0100
@@ -1,3 +1,28 @@
+2018-06-20  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add FinalState(fs, cut) augmenting constructor, and PrevFS projection machinery. Validated for a abscharge > 0 cut.
+
+	* Add hasProjection() methods to ProjectionHandler and ProjectionApplier.
+
+	* Clone MC_GENERIC as MC_FSPARTICLES and deprecate the badly-named original.
+
+	* Fix Spires -> Inspire ID for CMS_2017_I1518399.
+
+2018-06-04  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix installation of (In)DirectFinalState.hh
+
+2018-05-31  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add init-time setting of a single weight-vector index from the
+	RIVET_WEIGHT_INDEX environment variable. To be removed in v3, but
+	really we should have done this years ago... and we don't know how
+	long the handover will be.
+
+2018-05-22  Neil Warrack  <neil.warrack at cern.ch>
+
+	* Include 'unphysical' photon parents in PartonicTops' veto of prompt leptons from photon conversions.
+
 2018-05-20  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Make Particles and Jets into actual specialisations of
--- a/analyses/Makefile.am	Thu May 24 10:52:45 2018 +0100
+++ b/analyses/Makefile.am	Sat Jun 23 15:10:31 2018 +0100
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = -Wno-portability
+SHELL := bash -O extglob
 
 if ENABLE_ANALYSES
 
@@ -13,21 +14,21 @@
 %.so:
 	@+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_builddir)/bin/rivet-buildplugin -j2 $@ $^ -I$(top_builddir)/include
 
-RivetALICEAnalyses.so: $(shell ls $(srcdir)/pluginALICE/*.cc)
-RivetATLASAnalyses.so: $(shell ls $(srcdir)/pluginATLAS/*.cc)
-RivetCDFAnalyses.so  : $(shell ls $(srcdir)/pluginCDF/*.cc)
-RivetCMSAnalyses.so  : $(shell ls $(srcdir)/pluginCMS/*.cc)
-RivetD0Analyses.so   : $(shell ls $(srcdir)/pluginD0/*.cc)
-RivetHERAAnalyses.so : $(shell ls $(srcdir)/pluginHERA/*.cc)
-RivetLEPAnalyses.so  : $(shell ls $(srcdir)/pluginLEP/*.cc)