[Rivet-svn] r3763 - branches/2011-07-aida2yoda/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jun  8 15:44:39 2012
New Revision: 3763

Log:
merge c3734, 3749 from trunk

Modified:
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212353.cc

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212353.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212353.cc	Fri Jun  8 15:43:07 2012	(r3762)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212353.cc	Fri Jun  8 15:44:39 2012	(r3763)
@@ -164,7 +164,7 @@
       }
 
       // discard jets that overlap with electrons
-      Jets cand_jets_2;
+      Jets recon_jets;
       foreach ( const Jet& jet, cand_jets ) {
           bool away_from_e = true;
           foreach ( const Particle & e, cand_e ) {
@@ -174,14 +174,14 @@
             }
           }
           if ( away_from_e )
-            cand_jets_2.push_back( jet );
+            recon_jets.push_back( jet );
       }
 
       // only consider leptons far from jet
       ParticleVector recon_e, recon_mu;
       foreach ( const Particle & e, cand_e ) {
         bool e_near_jet = false;
-        foreach ( const Jet& jet, cand_jets_2 ) {
+        foreach ( const Jet& jet, recon_jets ) {
           if ( deltaR(e.momentum(),jet.momentum()) < 0.4 &&
                deltaR(e.momentum(),jet.momentum()) > 0.2 )
             e_near_jet = true;
@@ -192,7 +192,7 @@
 
       foreach ( const Particle & mu, cand_mu ) {
         bool mu_near_jet = false;
-        foreach ( const Jet& jet, cand_jets_2 ) {
+        foreach ( const Jet& jet, recon_jets ) {
           if ( deltaR(mu.momentum(),jet.momentum()) < 0.4 )
             mu_near_jet = true;
         }
@@ -209,12 +209,6 @@
       }
       double eTmiss = pTmiss.pT();
 
-      // final jet filter
-      Jets recon_jets;
-      foreach ( const Jet& jet, cand_jets_2 ) {
-          recon_jets.push_back( jet );
-      }
-
 
       // ==================== observables ====================