[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/5b930d590095
branches:  release-2-4-x
changeset: 4945:5b930d590095
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Dec 03 22:43:26 2015 +0000
description:
Move contains() and has_key() functions on STL containers from std to Rivet namespaces.

details:   https://rivet.hepforge.org/hg/rivet/rev/b353f4657488
branches:  release-2-4-x
changeset: 4946:b353f4657488
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 04 16:38:10 2015 +0000
description:
Regroup the mkhtml --dry-run option flag

details:   https://rivet.hepforge.org/hg/rivet/rev/3b57de4b750c
branches:  release-2-4-x
changeset: 4947:3b57de4b750c
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 04 17:05:39 2015 +0000
description:
Pro-actively use -m/-M arguments when initially loading histograms in mkhtml, *before* passing them to cmphistos.

diffs (truncated from 176 to 50 lines):

--- a/ChangeLog	Thu Dec 03 12:41:31 2015 +0000
+++ b/ChangeLog	Fri Dec 04 17:05:39 2015 +0000
@@ -1,5 +1,12 @@
+2015-12-04  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Pro-actively use -m/-M arguments when initially loading
+	histograms in mkhtml, *before* passing them to cmphistos.
+
 2015-12-03  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Move contains() and has_key() functions on STL containers from std to Rivet namespaces.
+
 	* Adding IsRef attributes to all YODA refdata files; this will be
 	used to replace the /REF prefix in Rivet v3 onwards. The migration
 	has also removed leading # characters from BEGIN/END blocks, as
@@ -9,7 +16,7 @@
 
 2015-12-02  Andy Buckley  <andy.buckley at cern.ch>
 
-	* Add handling of a command-line PLOT 'file' argument to rivet-mkhtml, cf. rivet-cmphistos
+	* Add handling of a command-line PLOT 'file' argument to rivet-mkhtml, cf. rivet-cmphistos.
 
 	* Improvements to rivet-mkhtml behaviour re. consistency with
 	rivet-cmphistos in how muti-part histo paths are decomposed into
--- a/bin/rivet-mkhtml	Thu Dec 03 12:41:31 2015 +0000
+++ b/bin/rivet-mkhtml	Fri Dec 04 17:05:39 2015 +0000
@@ -36,6 +36,8 @@
                   default=False, help="ignore unvalidated analyses.")
 parser.add_option("--ref", "--refid", dest="REF_ID",
                   default=None, help="ID of reference data set (file path for non-REF data)")
+parser.add_option("--dry-run", help="don't actually do any plotting or HTML building", dest="DRY_RUN",
+                  action="store_true", default=False)
 
 stygroup = OptionGroup(parser, "Style options")
 stygroup.add_option("-t", "--title", dest="TITLE",
@@ -78,8 +80,6 @@
 vrbgroup = OptionGroup(parser, "Verbosity control")
 vrbgroup.add_option("-v", "--verbose", help="add extra debug messages", dest="VERBOSE",
                   action="store_true", default=False)
-vrbgroup.add_option("--dry-run", help="don't actually do any plotting or HTML building", dest="DRY_RUN",
-                  action="store_true", default=False)
 parser.add_option_group(vrbgroup)
 
 opts, yodafiles = parser.parse_args()
@@ -118,7 +118,8 @@
             continue
         else:
             sys.exit(2)
-    analysisobjects = yoda.read(yodafilepath)
+    ## Note: use -m/-M flags here as well as when calling rivet-cmphistos, to potentially speed this initial loading