[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/59420284b3cf
branches:  
changeset: 6164:59420284b3cf
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 08 14:19:34 2017 +0000
description:
Merge from 2.5.x

details:   https://rivet.hepforge.org/hg/rivet/rev/69184b556d33
branches:  
changeset: 6165:69184b556d33
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 08 14:29:21 2017 +0000
description:
Reinstate old IS_PARTON_PDGID macro in three analyses, to exactly preserve their < 2.6.0 behaviour. But now inlines, because macros interfere badly with the file-cat'ing build system

diffs (truncated from 116 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2013_I1243871.plot	Mon Dec 04 21:23:43 2017 +0000
+++ b/analyses/pluginATLAS/ATLAS_2013_I1243871.plot	Fri Dec 08 14:29:21 2017 +0000
@@ -56,7 +56,7 @@
 Title=Integrated jet shape for $b$-jets with $70\,\text{GeV} < p_T < 100\,\text{GeV}$
 # END PLOT
 # BEGIN PLOT /ATLAS_2013_I1243871/d05-x01-y02
-Title=Integrated jet shape for $b$-jets with 100\,\text{GeV} < p_T < 150\,\text{GeV}$
+Title=Integrated jet shape for $b$-jets with $100\,\text{GeV} < p_T < 150\,\text{GeV}$
 # END PLOT
 # BEGIN PLOT /ATLAS_2013_I1243871/d01-x02-y02
 Title=Integrated jet shape for light jets with $30\,\text{GeV} < p_T < 40\,\text{GeV}$
--- a/analyses/pluginLEP/ALEPH_2001_S4656318.cc	Mon Dec 04 21:23:43 2017 +0000
+++ b/analyses/pluginLEP/ALEPH_2001_S4656318.cc	Fri Dec 08 14:29:21 2017 +0000
@@ -15,8 +15,15 @@
     /// Constructor
    ALEPH_2001_S4656318()
       : Analysis("ALEPH_2001_S4656318")
-    {
-    }
+    {    }
+
+
+    /// @name Helper functions
+    /// @note The PID:: namespace functions would be preferable, but don't have exactly the same behaviour. Preserving the original form.
+    //@{
+    bool isParton(int id) { return abs(id) <= 100 && abs(id) != 22 && (abs(id) < 11 || abs(id) > 18); }
+    // bool isBHadron(int id) { return ((abs(id)/100)%10 == 5) || (abs(id) >= 5000 && abs(id) <= 5999); }
+    //@}
 
 
     /// @name Analysis methods
@@ -54,7 +61,7 @@
       MSG_DEBUG("Avg beam momentum = " << meanBeamMom);
 
 
-      foreach (const GenParticle* p, particles(e.genEvent())) {
+      for (const GenParticle* p : particles(e.genEvent())) {
         const GenVertex* pv = p->production_vertex();
         const GenVertex* dv = p->end_vertex();
         if (PID::isBottomHadron(p->pdg_id())) {
@@ -64,7 +71,7 @@
           if (pv) {
             bool is_primary = false;
             for (GenVertex::particles_in_const_iterator pp = pv->particles_in_const_begin(); pp != pv->particles_in_const_end() ; ++pp) {
-              if (PID::isParton((*pp)->pdg_id())) is_primary = true;
+              if (isParton((*pp)->pdg_id())) is_primary = true;
             }
             if (is_primary) {
               _histXbprim->fill(xp, weight);
--- a/analyses/pluginLEP/DELPHI_2002_069_CONF_603.cc	Mon Dec 04 21:23:43 2017 +0000