[Rivet-svn] r4159 - in trunk: . data/anainfo src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Feb 14 13:52:40 2013
New Revision: 4159

Log:
merge c4077 and c4079 from branches/2012-06-aidarivet

Modified:
   trunk/ChangeLog
   trunk/data/anainfo/CMS_2011_S9120041.info
   trunk/src/Analyses/CMS_2011_S9120041.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Feb 14 13:49:53 2013	(r4158)
+++ trunk/ChangeLog	Thu Feb 14 13:52:40 2013	(r4159)
@@ -20,6 +20,10 @@
 
 	* Fix TeX variable in the rivetenv scripts, especially for csh
 
+2012-12-12  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Correction to jet acceptance in CMS_2011_S9120041, from Sercan Sen: thanks!
+
 2012-12-07  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version number bump to 1.8.2 -- release approaching.

Modified: trunk/data/anainfo/CMS_2011_S9120041.info
==============================================================================
--- trunk/data/anainfo/CMS_2011_S9120041.info	Thu Feb 14 13:49:53 2013	(r4158)
+++ trunk/data/anainfo/CMS_2011_S9120041.info	Thu Feb 14 13:52:40 2013	(r4159)
@@ -10,14 +10,14 @@
 References:
   - J. High Energy Phys 09 (2011) 109
 RunInfo:
-   Non single diffrative events. Switch on single diffraction in generator.
-   The profile plots require large statistics.
+   Requires inclusive inelastic events (non-diffractive and inelastic
+   diffractive). The profile plots require large statistics.
 Beams: [p+, p+]
 Energies: [900, 7000]
 pT Cuts: pT > 0.5 GeV (all tracks).
 Description:
    A measurement of the underlying activity in scattering processes with a hard
-   scale in the several GeV region is performed in proton-proton collisions at
+   scale in the several-GeV region is performed in proton-proton collisions at
    Energies of 0.9 and 7 TeV, using data collected by the CMS experiment at the
    LHC. The production of charged particles with pseudorapidity |eta| < 2 and
    transverse momentum pT > 0.5 GeV/c is studied in the azimuthal region transverse

Modified: trunk/src/Analyses/CMS_2011_S9120041.cc
==============================================================================
--- trunk/src/Analyses/CMS_2011_S9120041.cc	Thu Feb 14 13:49:53 2013	(r4158)
+++ trunk/src/Analyses/CMS_2011_S9120041.cc	Thu Feb 14 13:52:40 2013	(r4159)
@@ -11,6 +11,7 @@
 
 namespace Rivet {
 
+
   // UE charged particles vs. leading jet
   class CMS_2011_S9120041 : public Analysis {
   public:
@@ -24,8 +25,6 @@
       addProjection(cfs, "CFS");
 
       const ChargedFinalState cfsforjet(-2.5, 2.5, 500*MeV);
-      addProjection(cfsforjet, "CFSforjet");
-
       const FastJets jetpro(cfsforjet, FastJets::SISCONE, 0.5);
       addProjection(jetpro, "Jets");
 
@@ -60,10 +59,15 @@
     void analyze(const Event& event) {
       const double weight = event.weight();
 
-      Jets jets = applyProjection<FastJets>(event, "Jets").jetsByPt(1.0*GeV);
-      if (jets.size() < 1) vetoEvent;
-
-      FourMomentum p_lead = jets[0].momentum();
+      // Find the lead jet, applying a restriction that the jets must be within |eta| < 2.
+      FourMomentum p_lead;
+      foreach (const Jet& j, applyProjection<FastJets>(event, "Jets").jetsByPt(1.0*GeV)) {
+        if (fabs(j.momentum().eta()) < 2.0) {
+          p_lead = j.momentum();
+          break;
+        }
+      }
+      if (p_lead.isZero()) vetoEvent;
       const double philead = p_lead.phi();
       const double pTlead  = p_lead.pT();