[Rivet-svn] rivet: 9 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/b7bfef4eccb7
branches:  release-2-5-x
changeset: 5343:b7bfef4eccb7
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 14:50:42 2016 +0100
description:
Pass abs'd RIVET_DATA_PATH from rivet-mkhtml to rivet-cmphistos

details:   https://rivet.hepforge.org/hg/rivet/rev/2d3b8fa65cc6
branches:  release-2-5-x
changeset: 5344:2d3b8fa65cc6
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 14:58:53 2016 +0100
description:
Add setAnalysisDataPaths and addAnalysisDataPath to RivetPaths.hh/cc and Python.

details:   https://rivet.hepforge.org/hg/rivet/rev/f4d266249d98
branches:  release-2-5-x
changeset: 5345:f4d266249d98
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 15:01:30 2016 +0100
description:
Set data path as well as lib path in scripts with --pwd option, and use abs path to /home/andy/proj/hep/rivet-25x/bin.

details:   https://rivet.hepforge.org/hg/rivet/rev/15b1a8280f02
branches:  release-2-5-x
changeset: 5346:15b1a8280f02
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 16:25:35 2016 +0100
description:
Reorganisation in Particle and Jet utils headers, adding Rivet/Tools/JetUtils.hh

details:   https://rivet.hepforge.org/hg/rivet/rev/81b2ff153263
branches:  release-2-5-x
changeset: 5347:81b2ff153263
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 16:31:43 2016 +0100
description:
Utils.hh: add a generic sum() function for containers, and use auto in loop to support arrays.

details:   https://rivet.hepforge.org/hg/rivet/rev/4d0639e9f7b9
branches:  release-2-5-x
changeset: 5348:4d0639e9f7b9
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 16:52:02 2016 +0100
description:
Add Analysis::scale() and Analysis::divide() methods for Counter types.

details:   https://rivet.hepforge.org/hg/rivet/rev/68ce5af4c4a9
branches:  release-2-5-x
changeset: 5349:68ce5af4c4a9
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 20:58:48 2016 +0100
description:
Add vector<ptr> versions of Analysis::scale() and ::normalize(), for batched scaling.

details:   https://rivet.hepforge.org/hg/rivet/rev/490486a362eb
branches:  release-2-5-x
changeset: 5350:490486a362eb
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 21:15:30 2016 +0100
description:
Add Rivet/Tools/ParticleBaseUtils.hh to collect tools like functors for particle & jet filtering.

details:   https://rivet.hepforge.org/hg/rivet/rev/101d049aa58d
branches:  release-2-5-x
changeset: 5351:101d049aa58d
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 25 21:57:22 2016 +0100
description:
Add unbound accessors for momentum properties of ParticleBase objects.

diffs (truncated from 802 to 50 lines):

--- a/ChangeLog	Mon Jul 25 12:40:04 2016 +0100
+++ b/ChangeLog	Mon Jul 25 21:57:22 2016 +0100
@@ -1,3 +1,21 @@
+2016-07-25  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add unbound accessors for momentum properties of ParticleBase objects.
+
+	* Add Rivet/Tools/ParticleBaseUtils.hh to collect tools like functors for particle & jet filtering.
+
+	* Add vector<ptr> versions of Analysis::scale() and ::normalize(), for batched scaling.
+
+	* Add Analysis::scale() and Analysis::divide() methods for Counter types.
+
+	* Utils.hh: add a generic sum() function for containers, and use auto in loop to support arrays.
+
+	* Set data path as well as lib path in scripts with --pwd option, and use abs path to $PWD.
+
+	* Add setAnalysisDataPaths and addAnalysisDataPath to RivetPaths.hh/cc and Python.
+
+	* Pass absolutized RIVET_DATA_PATH from rivet-mkhtml to rivet-cmphistos.
+
 2016-07-24  Holger Schulz  <holger.schulz at cern.ch>
  
         * Mark CDF_2008_S77... b jet shapes validated
--- a/bin/rivet	Mon Jul 25 12:40:04 2016 +0100
+++ b/bin/rivet	Mon Jul 25 21:57:22 2016 +0100
@@ -211,11 +211,14 @@
 ## Override/modify analysis search path
 if opts.ANALYSIS_PATH:
     rivet.setAnalysisLibPaths(opts.ANALYSIS_PATH.split(":"))
+    rivet.setAnalysisDataPaths(opts.ANALYSIS_PATH.split(":"))
 if opts.ANALYSIS_PATH_APPEND:
     for ap in opts.ANALYSIS_PATH_APPEND.split(":"):
         rivet.addAnalysisLibPath(ap)
+        rivet.addAnalysisDataPath(ap)
 if opts.ANALYSIS_PATH_PWD:
-    rivet.addAnalysisLibPath(".")
+    rivet.addAnalysisLibPath(os.path.abspath("."))
+    rivet.addAnalysisDataPath(os.path.abspath("."))
 
 
 ## List of analyses
--- a/bin/rivet-cmphistos	Mon Jul 25 12:40:04 2016 +0100
+++ b/bin/rivet-cmphistos	Mon Jul 25 21:57:22 2016 +0100
@@ -54,7 +54,7 @@
     parser.add_option("--reftitle", dest="REFTITLE",
                         default='Data', help="Reference data legend entry")
     parser.add_option("--pwd", dest="PATH_PWD", action="store_true", default=False,
-                    help="append the current directory (pwd) to the analysis/data search paths (cf. $RIVET_ANALYSIS_PATH).")
+                    help="append the current directory (pwd) to the analysis/data search paths (cf. $RIVET_ANALYSIS/DATA_PATH).")