[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/4164c6984425
branches:  multiweight
changeset: 6002:4164c6984425
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Sep 06 16:05:36 2017 +0100
description:
Unchecked merge from default branch

details:   https://rivet.hepforge.org/hg/rivet/rev/099f7b5341db
branches:  multiweight
changeset: 6003:099f7b5341db
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Sep 07 15:39:49 2017 +0100
description:
Pass along the first argument of book(). Allows in-place usage of book() calls, making conversion of existing code easier.

details:   https://rivet.hepforge.org/hg/rivet/rev/17a6b1d62316
branches:  multiweight
changeset: 6004:17a6b1d62316
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Sep 07 15:40:12 2017 +0100
description:
Fix existing analyses

details:   https://rivet.hepforge.org/hg/rivet/rev/190b646d74d1
branches:  multiweight
changeset: 6005:190b646d74d1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Sep 07 15:40:15 2017 +0100
description:
Fix existing analyses

details:   https://rivet.hepforge.org/hg/rivet/rev/2feb5ce0603f
branches:  multiweight
changeset: 6006:2feb5ce0603f
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Sep 08 08:44:26 2017 +0100
description:
Merge compiles. TESTS NEEDED

diffs (truncated from 682245 to 50 lines):

--- a/.hgignore	Fri Aug 25 17:08:17 2017 +0200
+++ b/.hgignore	Fri Sep 08 08:44:26 2017 +0100
@@ -1,5 +1,5 @@
 ~$
-^run.*$
+^(anas|test|run).*$
 \.orig$
 \.(o|Po|lo|Plo|la|a|so|dylib|pyc|tar\.bz2|tar\.gz|fifo|hepmc)$
 ^config\.guess$
@@ -69,4 +69,4 @@
 ^Rivet-.\..\..$
 ^local/.*$
 ^(for|analyses)\d\d\d$
-^src/Analyses/.*__all\.cc$
+^analyses/data$
--- a/.hgtags	Fri Aug 25 17:08:17 2017 +0200
+++ b/.hgtags	Fri Sep 08 08:44:26 2017 +0100
@@ -70,3 +70,5 @@
 0000000000000000000000000000000000000000 rivet-2.5.2
 0000000000000000000000000000000000000000 rivet-2.5.2
 8a05acecd26c18f368f4b748da2d5aa2db46be6c rivet-2.5.2
+ad44338e2fa10dd81e2b306545b801ce53f31921 rivet-2.5.3
+d16ae7b046d6d448dc70d23dafcce12626eb47c9 rivet-2.5.4
--- a/COPYING	Fri Aug 25 17:08:17 2017 +0200
+++ b/COPYING	Fri Sep 08 08:44:26 2017 +0100
@@ -1,285 +1,626 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.