[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6d148d51b5b2
branches:  release-2-5-x
changeset: 5613:6d148d51b5b2
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 21 23:10:04 2016 +0000
description:
Add scaling to Cutflow/s

details:   https://rivet.hepforge.org/hg/rivet/rev/ddfc4deb5b11
branches:  release-2-5-x
changeset: 5614:ddfc4deb5b11
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Nov 24 21:04:14 2016 +0000
description:
Formatting improvements

details:   https://rivet.hepforge.org/hg/rivet/rev/e6b0bfab562a
branches:  release-2-5-x
changeset: 5615:e6b0bfab562a
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Nov 24 21:29:02 2016 +0000
description:
Reorder bits of the rivet script to make sure the paths are set before anything attempts to use the analysis list

details:   https://rivet.hepforge.org/hg/rivet/rev/261cb4f6b364
branches:  release-2-5-x
changeset: 5616:261cb4f6b364
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Nov 24 22:41:23 2016 +0000
description:
Adding pTvec() function to 4-vectors and ParticleBase.

diffs (truncated from 565 to 50 lines):

--- a/ChangeLog	Thu Nov 24 16:04:06 2016 +0000
+++ b/ChangeLog	Thu Nov 24 22:41:23 2016 +0000
@@ -1,6 +1,12 @@
+2016-11-24  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Adding pTvec() function to 4-vectors and ParticleBase.
+
+	* Fix --pwd option of the rivet script
+
 2016-11-21  Andy Buckley  <andy.buckley at cern.ch>
 
-	* Add weights to Cutflow/s functions.
+	* Add weights and scaling to Cutflow/s.
 
 2016-11-19  Andy Buckley  <andy.buckley at cern.ch>
 
--- a/bin/rivet	Thu Nov 24 16:04:06 2016 +0000
+++ b/bin/rivet	Thu Nov 24 22:41:23 2016 +0000
@@ -117,10 +117,21 @@
 opts, args = parser.parse_args()
 
 
+## 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(os.path.abspath("."))
+    rivet.addAnalysisDataPath(os.path.abspath("."))
+
+
 ## Configure logging
 logging.basicConfig(level=opts.LOGLEVEL, format="%(message)s")
-
-## Control native Rivet library logger
 for l in opts.NATIVE_LOG_STRS:
     name, level = None, None
     try:
@@ -140,118 +151,30 @@
         logging.warning("Couldn't process logging string '%s'" % l)
 
 
+
+############################
+## Listing available analyses/keywords
+