[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/eff11cce437c
branches:  
changeset: 5941:eff11cce437c
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Jul 08 11:40:56 2017 +0100
description:
Fix min(iterable, errval) to use errval cf. max(iterable)

details:   https://rivet.hepforge.org/hg/rivet/rev/aa75bdb05304
branches:  
changeset: 5942:aa75bdb05304
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Jul 08 11:41:05 2017 +0100
description:
Add Event::centrality(), for non-HepMC access to the generator value if one has been recorded -- otherwise -1.

details:   https://rivet.hepforge.org/hg/rivet/rev/533fbadbd7f9
branches:  
changeset: 5943:533fbadbd7f9
user:      Andy Buckley <andy at insectnation.org>
date:      Sun Jul 09 11:02:44 2017 +0100
description:
Rationalise/fix Jet and Particle string representation overloading

diffs (truncated from 298 to 50 lines):

--- a/ChangeLog	Fri Jun 30 15:04:06 2017 +0100
+++ b/ChangeLog	Sun Jul 09 11:02:44 2017 +0100
@@ -1,3 +1,8 @@
+2017-07-08  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add Event::centrality(), for non-HepMC access to the generator
+	value if one has been recorded -- otherwise -1.
+
 2017-06-28  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Split the smearing functions into separate header files for
--- a/include/Rivet/Event.hh	Fri Jun 30 15:04:06 2017 +0100
+++ b/include/Rivet/Event.hh	Sun Jul 09 11:02:44 2017 +0100
@@ -47,6 +47,15 @@
     /// @name Major event properties
     //@{
 
+    /// The generated event obtained from an external event generator
+    const GenEvent* genEvent() const { return &_genevent; }
+
+    /// @brief The generation weight associated with the event
+    ///
+    /// @todo This needs to be revisited when we finally add the mechanism to
+    /// support NLO counter-events and weight vectors.
+    double weight() const;
+
     /// Get the beam particles
     ParticlePair beams() const;
 
@@ -56,14 +65,20 @@
     /// Get the beam centre-of-mass energy per nucleon
     double asqrtS() const;
 
+    /// Get the generator centrality (impact-parameter quantile in [0,1]; or -1 if undefined (usual for non-HI generators))
+    double centrality() const;
+
     // /// Get the boost to the beam centre-of-mass
     // Vector3 beamCMSBoost() const;
 
     // /// Get the boost to the beam centre-of-mass
     // LorentzTransform beamCMSTransform();
 
-    /// The generated event obtained from an external event generator
-    const GenEvent* genEvent() const { return &_genevent; }
+    //@}
+
+
+    /// @name Access to event particles
+    //@{