[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/7f4b1622e5dc
branches:  release-2-5-x
changeset: 5750:7f4b1622e5dc
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 08 11:35:54 2017 +0100
description:
Improve DISLepton for HERA analyses: thanks to Andrii Verbytskyi for the patch!

details:   https://rivet.hepforge.org/hg/rivet/rev/5843dee6b67e
branches:  release-2-5-x
changeset: 5751:5843dee6b67e
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 08 12:05:07 2017 +0100
description:
Fix Doxygen config and Makefile target to allow working with out-of-source builds. Thanks to Christian Holm Christensen.

diffs (truncated from 138 to 50 lines):

--- a/ChangeLog	Fri May 05 17:54:57 2017 +0100
+++ b/ChangeLog	Mon May 08 12:05:07 2017 +0100
@@ -1,3 +1,10 @@
+2017-05-08  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix Doxygen config and Makefile target to allow working with
+	out-of-source builds. Thanks to Christian Holm Christensen.
+
+	* Improve DISLepton for HERA analyses: thanks to Andrii Verbytskyi for the patch!
+
 2017-03-30  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Replace non-template Analysis::refData functions with C++11 default T=Scatter2D.
--- a/Doxyfile.in	Fri May 05 17:54:57 2017 +0100
+++ b/Doxyfile.in	Mon May 08 12:05:07 2017 +0100
@@ -656,8 +656,8 @@
 # with spaces.
 
 INPUT                  = . \
-                         src \
-                         include/Rivet
+                         @top_srcdir@/src \
+                         @top_srcdir@/include/Rivet
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
--- a/Makefile.am	Fri May 05 17:54:57 2017 +0100
+++ b/Makefile.am	Mon May 08 12:05:07 2017 +0100
@@ -21,7 +21,7 @@
 if WITH_DOXYGEN
 dox:
 	@echo "Running Doxygen..."
-	@$(DOXYGEN) $(top_srcdir)/Doxyfile || true
+	@$(DOXYGEN) $(top_builddir)/Doxyfile || true
 install-dox:
 	$(install_sh_DATA) doxy/html/* $(DESTDIR)$(pkgdatadir)/doc/html
 mostlyclean-local:
--- a/include/Rivet/Projections/DISLepton.hh	Fri May 05 17:54:57 2017 +0100
+++ b/include/Rivet/Projections/DISLepton.hh	Mon May 08 12:05:07 2017 +0100
@@ -38,6 +38,7 @@
     /// Compare with other projections.
     virtual int compare(const Projection& p) const;
 
+
   public:
 
     /// The incoming lepton.
@@ -46,7 +47,9 @@
     /// The outgoing lepton.
     const Particle& out() const { return _outgoing; }