[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/102dd5098374
branches:  
changeset: 6067:102dd5098374
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 03 15:59:47 2017 +0100
description:
Python3 compatibility changes

details:   https://rivet.hepforge.org/hg/rivet/rev/228b8cfc3651
branches:  
changeset: 6068:228b8cfc3651
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 03 16:07:54 2017 +0100
description:
More Py3 compat

details:   https://rivet.hepforge.org/hg/rivet/rev/8bef99b3c2a0
branches:  
changeset: 6069:8bef99b3c2a0
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 03 16:22:54 2017 +0100
description:
More Py3 compat

details:   https://rivet.hepforge.org/hg/rivet/rev/e9fbb85eebd2
branches:  
changeset: 6070:e9fbb85eebd2
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 03 16:27:12 2017 +0100
description:
Last Py3 compat

diffs (truncated from 570 to 50 lines):

--- a/bin/rivet	Mon Oct 02 12:02:19 2017 +0100
+++ b/bin/rivet	Tue Oct 03 16:27:12 2017 +0100
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 """\
-Run Rivet analyses on inputted events from file or Unix pipe
+Run Rivet analyses on HepMC events read from a file or Unix pipe
 
 Examples:
 
@@ -9,6 +9,7 @@
 
   or
 
+  mkfifo fifo.hepmc
   my_generator -o fifo.hepmc &
   %prog [options] fifo.hepmc
 
@@ -17,8 +18,10 @@
  * 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
+ * See the documentation for more environment variables.
 """
 
+from __future__ import print_function
 import os, sys
 
 ## Load the rivet module
@@ -211,7 +214,7 @@
                             msg += "  [" + " ".join(a.keywords()) + "]"
                         if a.luminosityfb():
                             msg += "  [ \int L = %s fb^{-1} ]"%a.luminosityfb()
-                print msg
+                print(msg)
                 #os.write(tf, msg + "\n")
         # if os.path.getsize(tfpath) > 0:
         #     pager = subprocess.Popen(["less", "-FX", tfpath]) #, stdin=subprocess.PIPE)
@@ -234,7 +237,7 @@
 if opts.LIST_KEYWORDS:
     # a = rivet.AnalysisLoader.getAnalysis(aname)
     for k in getKeywords(all_analyses):
-        print k
+        print(k)
     sys.exit(0)
 
 
@@ -361,7 +364,7 @@
                 pager.communicate()