[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/25c1c0587783
branches:  
changeset: 4828:25c1c0587783
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jul 29 12:34:00 2015 +0100
description:
Add exception handling and pre-emptive testing for a non-writeable output directory (based on patch from Lukas Heinrich).

details:   https://rivet.hepforge.org/hg/rivet/rev/ae3881bf3b59
branches:  
changeset: 4829:ae3881bf3b59
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jul 29 23:22:16 2015 +0100
description:
Make exception catching more generic to avoid tying to YODA head... but note that there's a problem with the YODA head due to smart pointers not matching the pointer version of writeBody(): need more traits magic?

details:   https://rivet.hepforge.org/hg/rivet/rev/c3e2d836a564
branches:  
changeset: 4830:c3e2d836a564
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jul 29 23:22:39 2015 +0100
description:
Whitespace and other minor code cosmetics

details:   https://rivet.hepforge.org/hg/rivet/rev/8ae35ba84986
branches:  
changeset: 4831:8ae35ba84986
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jul 29 23:23:15 2015 +0100
description:
Tiny code style consistency fix

details:   https://rivet.hepforge.org/hg/rivet/rev/f0c7ebcdae44
branches:  
changeset: 4832:f0c7ebcdae44
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jul 29 23:23:27 2015 +0100
description:
Add optional Cut arguments to all the Jet tag methods.

diffs (truncated from 317 to 50 lines):

--- a/ChangeLog	Wed Jul 29 11:57:34 2015 +0100
+++ b/ChangeLog	Wed Jul 29 23:23:27 2015 +0100
@@ -1,3 +1,11 @@
+2015-07-29  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add optional Cut arguments to all the Jet tag methods.
+
+	* Add exception handling and pre-emptive testing for a
+	non-writeable output directory (based on patch from Lukas
+	Heinrich).
+
 2015-07-02  Holger Schulz  <holger.schulz at durham.ac.uk>
 
 	* Tidy up ATLAS higgs combination analysis.
--- a/bin/rivet	Wed Jul 29 11:57:34 2015 +0100
+++ b/bin/rivet	Wed Jul 29 23:23:27 2015 +0100
@@ -368,6 +368,18 @@
     #                 (n, elapsedtime, remainingtime, eta))
 
 
+## Do some checks on output histo file, before we stat the event loop
+histo_parentdir = os.path.dirname(os.path.abspath(opts.HISTOFILE))
+
+if not os.path.exists(histo_parentdir):
+  logging.error('Parent path of output histogram file does not exist: %s\nExiting.' % histo_parentdir)
+  sys.exit(1)
+
+if not os.access(histo_parentdir,os.W_OK):
+  logging.error('Insufficient permissions to write output histogram file to directory %s\nExiting.' % histo_parentdir)
+  sys.exit(1)
+
+
 ## Set up analysis handler
 RUNNAME = opts.RUN_NAME or ""
 ah = rivet.AnalysisHandler(RUNNAME)
--- a/include/Rivet/Cuts.hh	Wed Jul 29 11:57:34 2015 +0100
+++ b/include/Rivet/Cuts.hh	Wed Jul 29 23:23:27 2015 +0100
@@ -4,39 +4,44 @@
 
 namespace Rivet {
 
+
   /// @internal Forward declaration of helper class. Not for end users.
   class CuttableBase;
 
   /// @internal Base class for cut objects.
   /// @note End users should always use the @ref Cut typedef instead.
   class CutBase;
+
   /// Main cut object