[Rivet-svn] rivet: Correctly normalise ALEPH charm fragmentation analysis to...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/5790ea30b870
branches:  release-2-5-x
changeset: 5781:5790ea30b870
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Tue May 16 15:44:02 2017 -0700
description:
Correctly normalise ALEPH charm fragmentation analysis to data and clean up code.

diffs (truncated from 87 to 50 lines):

--- a/ChangeLog	Tue May 16 23:01:22 2017 +0100
+++ b/ChangeLog	Tue May 16 15:44:02 2017 -0700
@@ -1,3 +1,8 @@
+2016-05-16  Holger Schulz  <holger.schulz at durham.ac.uk>
+
+	* Tidy ALEPH_1999 charm fragmentation analysis and normalise to data
+	integral. Added DSTARPLUS and DSTARMINUS to PID.
+
 2017-05-16  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add ATLAS_2016_CONF_2016_092, inclusive jet cross sections using early 13 TeV data.
--- a/include/Rivet/Tools/ParticleName.hh	Tue May 16 23:01:22 2017 +0100
+++ b/include/Rivet/Tools/ParticleName.hh	Tue May 16 15:44:02 2017 -0700
@@ -102,6 +102,8 @@
     static const PdgId D0BAR = -421;
     static const PdgId DPLUS = 411;
     static const PdgId DMINUS = -DPLUS;
+    static const PdgId DSTARPLUS = 413;
+    static const PdgId DSTARMINUS = -DSTARPLUS;
     static const PdgId DSPLUS = 431;
     static const PdgId DSMINUS = -DSPLUS;
     //@}
--- a/src/Analyses/ALEPH_1999_S4193598.cc	Tue May 16 23:01:22 2017 +0100
+++ b/src/Analyses/ALEPH_1999_S4193598.cc	Tue May 16 15:44:02 2017 -0700
@@ -15,9 +15,7 @@
     /// Constructor
     ALEPH_1999_S4193598()
       : Analysis("ALEPH_1999_S4193598")
-    {
-      _sumWpassed = 0.0;
-    }
+    { }
 
     //@}
 
@@ -42,8 +40,6 @@
       const ChargedFinalState& cfs = apply<ChargedFinalState>(event, "CFS");
       if (cfs.size() < 5) vetoEvent;
 
-      _sumWpassed += weight;
-
       const UnstableFinalState& ufs = apply<UnstableFinalState>(event, "UFS");
 
       // Get beams and average beam momentum
@@ -51,21 +47,12 @@
       const double meanBeamMom = ( beams.first.p3().mod() +
                                    beams.second.p3().mod() ) / 2.0/GeV;
 
-      foreach (const Particle& p, ufs.particles()) {
-        const PdgId pid = p.abspid();