[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/ed7a38c75fd1
branches:  release-2-4-x
changeset: 4916:ed7a38c75fd1
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Nov 06 12:50:09 2015 +0000
description:
Removing handling of space-separated (quoted) lists of analysis names. The intended use-case doesn't work, so we'll stick with comma-separation only

details:   https://rivet.hepforge.org/hg/rivet/rev/9bf13efde15d
branches:  
changeset: 4917:9bf13efde15d
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Nov 05 12:19:40 2015 +0000
description:
Merge with 2-4-x release branch developments

details:   https://rivet.hepforge.org/hg/rivet/rev/2a3cd3a4d7f3
branches:  
changeset: 4918:2a3cd3a4d7f3
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Nov 06 12:50:58 2015 +0000
description:
Merging from 24x

details:   https://rivet.hepforge.org/hg/rivet/rev/db2e055494a0
branches:  
changeset: 4919:db2e055494a0
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Nov 06 12:51:26 2015 +0000
description:
Merging again from 24x

diffs (truncated from 141 to 50 lines):

--- a/ChangeLog	Thu Nov 05 16:25:19 2015 +0000
+++ b/ChangeLog	Fri Nov 06 12:51:26 2015 +0000
@@ -1,6 +1,6 @@
 2015-11-05  Andy Buckley  <andy.buckley at cern.ch>
 
-	* Allow comma and space-separated analysis name lists to be passed to a single -a/--analysis/--analyses option.
+	* Allow comma-separated analysis name lists to be passed to a single -a/--analysis/--analyses option.
 
 	* Convert namespace-global const variables to be static, to suppress compiler warnings.
 
@@ -16,6 +16,10 @@
 
 	* Release 2.4.0
 
+2015-10-14  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Adding missing scale and normalize method bodies for 2D histograms.
+
 2015-10-06  Holger Schulz  <holger.schulz at durham.ac.uk>
 
 	* Adding CMS_2015_I1327224 dijet analysis (Mjj>2 TeV)
@@ -131,10 +135,6 @@
 	non-writeable output directory (based on patch from Lukas
 	Heinrich).
 
-2015-07-24  Andy Buckley  <andy.buckley at cern.ch>
-
-	* Version 2.3.0 release.
-
 2015-07-02  Holger Schulz  <holger.schulz at durham.ac.uk>
 
 	* Tidy up ATLAS higgs combination analysis.
--- a/bin/rivet	Thu Nov 05 16:25:19 2015 +0000
+++ b/bin/rivet	Fri Nov 06 12:51:26 2015 +0000
@@ -49,7 +49,7 @@
 anagroup = OptionGroup(parser, "Analysis handling")
 anagroup.add_option("-a", "--analysis", "--analyses", dest="ANALYSES", action="append",
                     default=[], metavar="ANA",
-                    help="add an analysis (or comma- or space-separated list of analyses) to the processing list.")
+                    help="add an analysis (or comma-separated list of analyses) to the processing list.")
 anagroup.add_option("--list-analyses", "--list", dest="LIST_ANALYSES", action="store_true",
                     default=False, help="show the list of available analyses' names. With -v, it shows the descriptions, too")
 anagroup.add_option("--list-used-analyses", action="store_true", dest="LIST_USED_ANALYSES",
@@ -134,13 +134,11 @@
         logging.warning("Couldn't process logging string '%s'" % l)
 
 
-## We allow comma-separated and space-separated lists of analysis names -- normalise the list here
+## We allow comma-separated lists of analysis names -- normalise the list here
 newanas = []