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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jun  8 15:27:10 2012
New Revision: 3756

Log:
merge c3719, 3744 from trunk

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

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2012_CONF_2012_041.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2012_CONF_2012_041.cc	Fri Jun  8 15:23:42 2012	(r3755)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2012_CONF_2012_041.cc	Fri Jun  8 15:27:10 2012	(r3756)
@@ -184,13 +184,13 @@
         if(fabs(jet.momentum().eta())>2.5||
            jet.momentum().perp()<25.) continue;
         bool away_from_e = true;
-          foreach ( const Particle & e, cand_hard_e ) {
-            if ( deltaR(e.momentum(),jet.momentum()) < 0.2 ) {
-              away_from_e = false;
-              break;
-            }
+        foreach ( const Particle & e, cand_hard_e ) {
+          if ( deltaR(e.momentum(),jet.momentum()) < 0.2 ) {
+            away_from_e = false;
+            break;
           }
-          if ( away_from_e ) recon_jets.push_back( jet );
+        }
+        if ( away_from_e ) recon_jets.push_back( jet );
       }
 
       // pTmiss
@@ -201,7 +201,7 @@
       }
       double eTmiss = pTmiss.pT();
 
-      // both selections require at least 3 jets
+      // both selections require at least 2 jets
       if(recon_jets.size()<2) vetoEvent;
 
       // start of meff calculation
@@ -209,7 +209,7 @@
       foreach( const Jet & jet, recon_jets) {
         HT += jet.momentum().perp();
       }
-      double m_eff  = HT+eTmiss;
+      double m_eff_inc  = HT+eTmiss;
 
       // hard selection exactly one candidate
       // and 1 recon and at least 3 jets
@@ -226,22 +226,25 @@
                          lepton.momentum().y()*pTmiss.y());
         mT = sqrt(mT);
         HT += pT;
-        m_eff += pT;
-
+        m_eff_inc += pT;
+        double m_eff = pT+eTmiss+recon_jets[0].momentum().perp()+
+          recon_jets[1].momentum().perp()+recon_jets[2].momentum().perp();
         // three jet selection
         if(recon_jets[0].momentum().perp()>100. &&
            (recon_jets.size() == 3 ||
             recon_jets[3].momentum().perp() < 80. ) &&
            mT>100. && eTmiss>250. && eTmiss/m_eff>0.3) {
-          if(m_eff>1200.) _count_3jet_channel->fill(0.5,weight);
-          _hist_m_eff_3jet->fill(min(1599.,m_eff),weight);
+          if(m_eff_inc>1200.) _count_3jet_channel->fill(0.5,weight);
+          _hist_m_eff_3jet->fill(min(1599.,m_eff_inc),weight);
         }
         // four jet selecton
-        if(recon_jets.size() >= 4 &&
-           recon_jets[3].momentum().perp() > 80.  &&
-           mT>100. && eTmiss>250. && eTmiss/m_eff>0.2) {
-          if(m_eff>800.) _count_4jet_channel->fill(0.5,weight);
-          _hist_m_eff_4jet->fill(min(1599.,m_eff),weight);
+        if(recon_jets.size() >= 4) {
+          m_eff += recon_jets[3].momentum().perp();
+          if(recon_jets[3].momentum().perp() > 80.  &&
+             mT>100. && eTmiss>250. && eTmiss/m_eff>0.2) {
+            if(m_eff_inc>800.) _count_4jet_channel->fill(0.5,weight);
+            _hist_m_eff_4jet->fill(min(1599.,m_eff_inc),weight);
+          }
         }
       }
 
@@ -261,10 +264,12 @@
                          lepton.momentum().y()*pTmiss.y());
         mT = sqrt(mT);
         HT += pT;
-        m_eff += pT;
+        m_eff_inc += pT;
+        double m_eff = pT+eTmiss+recon_jets[0].momentum().perp()+
+          recon_jets[1].momentum().perp();
         if (mT>100. && eTmiss>250.) {
           if( eTmiss/m_eff>0.3 ) _count_soft_channel->fill(0.5,weight);
-          _hist_eTmiss_m_eff_soft->fill( eTmiss/m_eff,weight);
+          _hist_eTmiss_m_eff_soft->fill( eTmiss/m_eff_inc,weight);
         }
       }
     }