[Rivet-svn] rivet: 7 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/a4b569ca15b2
branches:  
changeset: 5874:a4b569ca15b2
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 16:50:14 2017 +0100
description:
Add -f short format flag for make-plots

details:   https://rivet.hepforge.org/hg/rivet/rev/ab203fd3dbf4
branches:  
changeset: 5875:ab203fd3dbf4
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 16:51:13 2017 +0100
description:
Remove the UNUSED macro and find an alternative solution for the cases where it was used, since there was a risk of macro clashes with embedding codes.

details:   https://rivet.hepforge.org/hg/rivet/rev/485d0c30e5a0
branches:  
changeset: 5876:485d0c30e5a0
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 23:39:21 2017 +0100
description:
Tweaks to analysis building, data installation and uninstall, and fix make check

details:   https://rivet.hepforge.org/hg/rivet/rev/c177b17ce533
branches:  
changeset: 5877:c177b17ce533
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 23:39:41 2017 +0100
description:
Cosmetics

details:   https://rivet.hepforge.org/hg/rivet/rev/ea9676f70077
branches:  
changeset: 5878:ea9676f70077
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 23:41:33 2017 +0100
description:
Fix the smearing random number seed and make it thread-specific if OpenMP is available (not yet in the build system).

details:   https://rivet.hepforge.org/hg/rivet/rev/c411a1c75cfa
branches:  
changeset: 5879:c411a1c75cfa
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 23:47:55 2017 +0100
description:
Add missing EL and MU versions of data files

details:   https://rivet.hepforge.org/hg/rivet/rev/b72d32b78e9b
branches:  
changeset: 5880:b72d32b78e9b
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 23:50:26 2017 +0100
description:
Tweaks to info file summary info

diffs (truncated from 2324 to 50 lines):

--- a/.hgignore	Thu Jun 22 16:15:04 2017 +0100
+++ b/.hgignore	Thu Jun 22 23:50:26 2017 +0100
@@ -69,4 +69,4 @@
 ^Rivet-.\..\..$
 ^local/.*$
 ^(for|analyses)\d\d\d$
-^src/Analyses/.*__all\.cc$
+^Analyses/data$
--- a/Analyses/Makefile.am	Thu Jun 22 16:15:04 2017 +0100
+++ b/Analyses/Makefile.am	Thu Jun 22 23:50:26 2017 +0100
@@ -7,7 +7,7 @@
 PLUGIN_LIBS = $(patsubst plugin%,Rivet%Analyses.so,$(PLUGIN_DIRS))
 PLUGIN_DATAFILES = $(wildcard plugin*/*.info plugin*/*.plot plugin*/*.yoda)
 
-CLEANFILES = $(PLUGIN_LIBS)
+CLEANFILES = $(PLUGIN_LIBS) data
 EXTRA_DIST = $(PLUGIN_DIRS)
 
 %.so:
@@ -29,19 +29,18 @@
 RivetSPSAnalyses.so: $(wildcard pluginSPS/*.cc)
 RivetTOTEMAnalyses.so: $(wildcard pluginTOTEM/*.cc)
 
-all-local: $(PLUGIN_LIBS)
-
-# TODO: need dist and install hooks to strip out .hg dirs
+all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES)
+	@mkdir -p $(builddir)/data
+	@for i in $(PLUGIN_DATAFILES); do $(LN_S) -f ../$$i $(builddir)/data; done
 
 install-exec-local: $(PLUGIN_LIBS)
 	$(INSTALL) $^ $(DESTDIR)$(libdir)
 
 install-data-local: $(PLUGIN_DATAFILES)
-	@echo $^
 	$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	@cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS)
-	@cd $(DESTDIR)$(pkgdatadir) && rm -f $(PLUGIN_DATAFILES)
+	@cd $(DESTDIR)$(pkgdatadir) && for i in $(PLUGIN_DATAFILES); do ds="$$ds `basename $$i`"; done && rm -f $$dd
 
 endif
--- a/Analyses/pluginATLAS/ATLAS_2017_I1514251_EL.info	Thu Jun 22 16:15:04 2017 +0100
+++ b/Analyses/pluginATLAS/ATLAS_2017_I1514251_EL.info	Thu Jun 22 23:50:26 2017 +0100
@@ -1,9 +1,9 @@
 Name: ATLAS_2017_I1514251_EL
 Year: 2017
-Summary: Z plus jets at 13 TeV
+Summary: Z plus jets at 13 TeV, electron channel