Merge pull request #88 from EmyrClement/master

Further synchronisation with analysis tools

Author: kreczko

plugins/TopPairElectronPlusJets2012SelectionFilter.cc

@@ -265,9 +265,8 @@ bool TopPairElectronPlusJets2012SelectionFilter::isGoodElectron(const pat::Elect
 	bool notInCrack = fabs(electron.superCluster()->eta()) < 1.4442 || fabs(electron.superCluster()->eta()) > 1.5660;
 	//2D impact w.r.t primary vertex
 	bool passesD0 = fabs(electron.dB(pat::Electron::PV2D)) < 0.02; //cm
-//	bool passesHOverE = electron.hadronicOverEm() < 0.05; // same for EE and EB
 	bool passesID = electron.electronID("mvaTrigV0") > 0.5;
-	return passesPtAndEta && notInCrack && passesD0 && passesID; //&& passesHOverE;
+	return passesPtAndEta && notInCrack && passesD0 && passesID;
 }
 
 void TopPairElectronPlusJets2012SelectionFilter::cleanedJets() {
@@ -277,7 +276,7 @@ void TopPairElectronPlusJets2012SelectionFilter::cleanedJets() {
 		if (!isGoodJet(jet))
 			continue;
 		bool overlaps(false);
-		if (hasSignalElectron_) {
+		if (hasSignalElectron_ && goodIsolatedElectrons_.size() == 1) {
 			double dR = deltaR(signalElectron_, jet);
 			overlaps = dR < 0.3;
 		}

plugins/TopPairMuonPlusJets2012SelectionFilter.cc

@@ -314,7 +314,7 @@ void TopPairMuonPlusJets2012SelectionFilter::cleanedJets() {
 		const pat::Jet jet = jets_.at(index);
 
 		bool overlaps(false);
-		if (hasSignalMuon_) {
+		if (hasSignalMuon_ && goodIsolatedMuons_.size() == 1) {
 			double dR = deltaR(signalMuon_, jet);
 			overlaps = dR < 0.3;
 		}