[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/7bcd08edc34a
branches:  release-2-4-x
changeset: 5109:7bcd08edc34a
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Apr 08 12:37:21 2016 +0100
description:
Add --pwd options to rivet-mkhtml and rivet-cmphistos

details:   https://rivet.hepforge.org/hg/rivet/rev/64aea648aa5b
branches:  release-2-4-x
changeset: 5110:64aea648aa5b
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Apr 08 15:07:53 2016 +0100
description:
Add RIVET_DATA_PATH variable and related functions in C++ and Python as a common first-fallback for RIVET_REF_PATH, RIVET_INFO_PATH, and RIVET_PLOT_PATH.

details:   https://rivet.hepforge.org/hg/rivet/rev/9ca400caf3e4
branches:  release-2-4-x
changeset: 5111:9ca400caf3e4
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Apr 08 15:41:38 2016 +0100
description:
Add a --guess-prefix flag to rivet-config, cf. fastjet-config.

diffs (truncated from 400 to 50 lines):

--- a/ChangeLog	Wed Apr 06 14:35:24 2016 +0100
+++ b/ChangeLog	Fri Apr 08 15:41:38 2016 +0100
@@ -1,3 +1,13 @@
+2016-04-08  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a --guess-prefix flag to rivet-config, cf. fastjet-config.
+
+	* Add RIVET_DATA_PATH variable and related functions in C++ and
+	Python as a common first-fallback for RIVET_REF_PATH,
+	RIVET_INFO_PATH, and RIVET_PLOT_PATH.
+
+	* Add --pwd options to rivet-mkhtml and rivet-cmphistos
+
 2016-03-25  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Bug-fix in semi-leptonic top selection of CMS_2015_I1370682.
--- a/bin/rivet	Wed Apr 06 14:35:24 2016 +0100
+++ b/bin/rivet	Fri Apr 08 15:41:38 2016 +0100
@@ -11,10 +11,7 @@
 ENVIRONMENT:
  * RIVET_ANALYSIS_PATH: list of paths to be searched for plugin
      analysis libraries at runtime
- * RIVET_REF_PATH: list of paths to be searched for reference
-     data files
- * RIVET_INFO_PATH: list of paths to be searched for analysis
-     metadata files
+ * RIVET_DATA_PATH: list of paths to be searched for data files
 """
 
 import os, sys
@@ -62,7 +59,7 @@
 anagroup.add_option("--analysis-path-append", dest="ANALYSIS_PATH_APPEND", metavar="PATH", default=None,
                     help="append to the analysis search path (cf. $RIVET_ANALYSIS_PATH).")
 anagroup.add_option("--pwd", dest="ANALYSIS_PATH_PWD", action="store_true", default=False,
-                    help="append the current directory (pwd) to the analysis search path (cf. $RIVET_ANALYSIS_PATH).")
+                    help="append the current directory (pwd) to the analysis/data search paths (cf. $RIVET_ANALYSIS_PATH).")
 # TODO: add control for more paths?
 parser.add_option_group(anagroup)
 
--- a/bin/rivet-cmphistos	Wed Apr 06 14:35:24 2016 +0100
+++ b/bin/rivet-cmphistos	Fri Apr 08 15:41:38 2016 +0100
@@ -8,6 +8,11 @@
 
 where the plot options are described in the make-plots manual in the HISTOGRAM
 section.
+
+ENVIRONMENT:
+ * RIVET_ANALYSIS_PATH: list of paths to be searched for plugin
+     analysis libraries at runtime
+ * RIVET_DATA_PATH: list of paths to be searched for data files