[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/71066a002254
branches:  release-2-5-x
changeset: 5330:71066a002254
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 21 14:39:13 2016 +0100
description:
Add extra debug info to exception messages when a 4-vector with -ve mass is explicitly requested

details:   https://rivet.hepforge.org/hg/rivet/rev/c74696683771
branches:  release-2-5-x
changeset: 5331:c74696683771
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 21 14:57:50 2016 +0100
description:
Fix n_evnt printout and off-by-one max event condition when skipping events

details:   https://rivet.hepforge.org/hg/rivet/rev/476b639453ea
branches:  release-2-5-x
changeset: 5332:476b639453ea
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 21 15:03:42 2016 +0100
description:
Add protections against -ve mass from numerical precision errors in smearing functions.

details:   https://rivet.hepforge.org/hg/rivet/rev/572292668292
branches:  release-2-5-x
changeset: 5333:572292668292
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 21 15:04:10 2016 +0100
description:
Merge

diffs (truncated from 186 to 50 lines):

--- a/ChangeLog	Wed Jul 20 21:23:16 2016 +0100
+++ b/ChangeLog	Thu Jul 21 15:04:10 2016 +0100
@@ -1,3 +1,7 @@
+2016-07-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add protections against -ve mass from numerical precision errors in smearing functions.
+
 2016-07-20  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Move several internal system headers into the include/Rivet/Tools directory.
--- a/bin/rivet	Wed Jul 20 21:23:16 2016 +0100
+++ b/bin/rivet	Thu Jul 21 15:04:10 2016 +0100
@@ -522,17 +522,17 @@
     logging.info(msg)
 
     ## The event loop
-    while opts.MAXEVTNUM is None or evtnum-opts.EVTSKIPNUM <= opts.MAXEVTNUM:
+    while opts.MAXEVTNUM is None or evtnum-opts.EVTSKIPNUM < opts.MAXEVTNUM:
         evtnum += 1
 
         ## Optional event skipping
         if evtnum <= opts.EVTSKIPNUM:
-            logging.debug( "Skipping event #%i"%evtnum)
+            logging.debug("Skipping event #%i" % evtnum)
             run.skipEvent();
             continue
 
         ## Only log the event number once we're actually processing
-        logNEvt(evtnum+opts.EVTSKIPNUM, starttime, opts.MAXEVTNUM)
+        logNEvt(evtnum, starttime, opts.MAXEVTNUM)
 
         ## Process this event
         processed_ok = run.processEvent()
--- a/data/anainfo/CDF_2008_S7541902.info	Wed Jul 20 21:23:16 2016 +0100
+++ b/data/anainfo/CDF_2008_S7541902.info	Thu Jul 21 15:04:10 2016 +0100
@@ -4,7 +4,7 @@
 Experiment: CDF
 Collider: Tevatron Run 2
 SpiresID: 7541902
-Status: UNVALIDATED
+Status: VALIDATED
 Authors:
  - Ben Cooper <b.d.cooper at qmul.ac.uk>
  - Emily Nurse <nurse at hep.ucl.ac.uk>
--- a/include/Rivet/Config/RivetCommon.hh	Wed Jul 20 21:23:16 2016 +0100
+++ b/include/Rivet/Config/RivetCommon.hh	Thu Jul 21 15:04:10 2016 +0100
@@ -51,7 +51,7 @@
 #include "Rivet/Tools/ParticleName.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"