[Rivet-svn] r3384 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: richardn
Date: Thu Sep 22 14:46:00 2011
New Revision: 3384

Log:
fix to inputs to jet algorithm

Modified:
   trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc
   trunk/src/Analyses/ATLAS_2011_S8983313.cc
   trunk/src/Analyses/ATLAS_2011_S9019561.cc

Modified: trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc	Thu Sep 22 13:53:44 2011	(r3383)
+++ trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc	Thu Sep 22 14:46:00 2011	(r3384)
@@ -63,8 +63,7 @@
 
       // Jet finder
       VetoedFinalState vfs;
-      vfs.addVetoPairDetail(MUON,10*GeV,7000*GeV);
-      vfs.addVetoPairDetail(ELECTRON,20*GeV,7000*GeV);
+      vfs.addVetoPair(MUON);
       addProjection(FastJets(vfs, FastJets::ANTIKT, 0.4),
                    "AntiKtJets04");
 
@@ -172,20 +171,20 @@
 	       deltaR(e.momentum(),jet.momentum()) > 0.2 )
 	    e_near_jet = true;
 	}
-        if ( e_near_jet == false )
+        if ( ! e_near_jet )
           recon_e.push_back( e );
-       }
+      }
 
       foreach ( const Particle & mu, cand_mu ) {
-         bool mu_near_jet = false;
-         foreach ( const Jet& jet, cand_jets_2 ) {
-           if ( deltaR(mu.momentum(),jet.momentum()) < 0.4 )
-	     mu_near_jet = true;
-	 }
-	 if ( mu_near_jet == false )
+	bool mu_near_jet = false;
+	foreach ( const Jet& jet, cand_jets_2 ) {
+	  if ( deltaR(mu.momentum(),jet.momentum()) < 0.4 )
+	    mu_near_jet = true;
+	}
+	if ( ! mu_near_jet )
 	  recon_mu.push_back( mu );
-       }
-
+      }
+      
       // pTmiss
       ParticleVector vfs_particles
 	= applyProjection<VisibleFinalState>(event, "vfs").particles();

Modified: trunk/src/Analyses/ATLAS_2011_S8983313.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_S8983313.cc	Thu Sep 22 13:53:44 2011	(r3383)
+++ trunk/src/Analyses/ATLAS_2011_S8983313.cc	Thu Sep 22 14:46:00 2011	(r3384)
@@ -64,8 +64,7 @@
 
 
       VetoedFinalState vfs;
-      vfs.addVetoPairDetail(MUON,20*GeV,7000*GeV);
-      vfs.addVetoPairDetail(ELECTRON,20*GeV,7000*GeV);
+      vfs.addVetoPairDetail(MUON);
 
 
       /// Jet finder

Modified: trunk/src/Analyses/ATLAS_2011_S9019561.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_S9019561.cc	Thu Sep 22 13:53:44 2011	(r3383)
+++ trunk/src/Analyses/ATLAS_2011_S9019561.cc	Thu Sep 22 14:46:00 2011	(r3384)
@@ -63,8 +63,7 @@
 
       // jet finder
       VetoedFinalState vfs;
-      vfs.addVetoPairDetail(MUON,20*GeV,7000*GeV);
-      vfs.addVetoPairDetail(ELECTRON,20*GeV,7000*GeV);
+      vfs.addVetoPairDetail(MUON);
       addProjection(FastJets(vfs, FastJets::ANTIKT, 0.4),
                    "AntiKtJets04");