[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/ccee63e50c19
branches:  release-2-4-x
changeset: 4967:ccee63e50c19
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jan 15 15:40:24 2016 +0000
description:
Change rivet-cmphistos path matching logic from match to search (user can add explicit ^ marker if they want match semantics).

details:   https://rivet.hepforge.org/hg/rivet/rev/eac0309bd1cf
branches:  release-2-4-x
changeset: 4968:eac0309bd1cf
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 08 11:39:05 2016 +0000
description:
Improve IOError handling in script UIs

details:   https://rivet.hepforge.org/hg/rivet/rev/19da751461ec
branches:  release-2-4-x
changeset: 4969:19da751461ec
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Feb 12 12:16:44 2016 +0000
description:
Update ParticleIdUtils.hh (i.e. PID:: functions) to use the functions from the latest version of MCUtils' PIDUtils.h.

diffs (truncated from 832 to 50 lines):

--- a/ChangeLog	Tue Dec 22 16:35:58 2015 +0000
+++ b/ChangeLog	Fri Feb 12 12:16:44 2016 +0000
@@ -1,3 +1,13 @@
+2016-02-12  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Update ParticleIdUtils.hh (i.e. PID:: functions) to use the
+	functions from the latest version of MCUtils' PIDUtils.h.
+
+2016-01-15  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Change rivet-cmphistos path matching logic from match to search
+	(user can add explicit ^ marker if they want match semantics).
+
 2015-12-20  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Improve linspace (and hence also logspace) precision errors by
--- a/bin/rivet-cmphistos	Tue Dec 22 16:35:58 2015 +0000
+++ b/bin/rivet-cmphistos	Fri Feb 12 12:16:44 2016 +0000
@@ -103,7 +103,7 @@
         mchistos.setdefault(infile, {})
         analysisobjects = yoda.read(infile, patterns=opts.PATHPATTERNS, unpatterns=opts.PATHUNPATTERNS)
         for path, ao in analysisobjects.iteritems():
-            m = re_path.match(path)
+            m = re_path.search(path)
             if m is None:
                 print "Found analysis object with non-standard path structure:", path
                 continue
@@ -292,7 +292,11 @@
     plotparser = rivet.mkStdPlotParser(plotdirs, opts.CONFIGFILES)
 
     ## Create a list of all histograms to be plotted, and identify if they are 2D histos (which need special plotting)
-    refhistos, mchistos = getHistos(filelist)
+    try:
+        refhistos, mchistos = getHistos(filelist)
+    except IOError, e:
+        print "File reading error: ", e.strerror
+        exit(1)
     hpaths, h2ds = [], []
     for aos in mchistos.values():
         for p in aos.keys():
@@ -305,7 +309,11 @@
 
     ## Take reference data from the Rivet search paths, if there is not already
     if opts.RIVETREFS:
-        refhistos2 = getRivetRefData()
+        try:
+            refhistos2 = getRivetRefData()
+        except IOError, e:
+            print "File reading error: ", e.strerror
+            exit(1)