From 4495f8ca9ba6e4d98f85331715529917595b59c0 Mon Sep 17 00:00:00 2001 From: perrozzi Date: Thu, 15 Oct 2015 09:06:20 +0200 Subject: [PATCH 1/8] correct rho and new effective area numbers in dedicated .h --- test/zmumu/MuonEffectiveArea.h | 65 ++++++++++++++++++++++++++++++++++ test/zmumu/addEAMiniIso.cxx | 54 ++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 test/zmumu/MuonEffectiveArea.h create mode 100644 test/zmumu/addEAMiniIso.cxx diff --git a/test/zmumu/MuonEffectiveArea.h b/test/zmumu/MuonEffectiveArea.h new file mode 100644 index 00000000000..0dc35507c21 --- /dev/null +++ b/test/zmumu/MuonEffectiveArea.h @@ -0,0 +1,65 @@ +//-------------------------------------------------------------------------------------------------- +// $Id $ +// +// MuonEffectiveArea +// +// Helper Class for storing effective areas +// +// Authors: S.Xie, E. DiMarco, L. Perrozzi +//-------------------------------------------------------------------------------------------------- + + +/// --> NOTE if you want to use this class as standalone without the CMSSW part +/// you need to uncomment the below line and compile normally with scramv1 b +/// Then you need just to load it in your root macro the lib with the correct path +//#define STANDALONE // <---- this line + +#ifndef MuonEffectiveArea_H +#define MuonEffectiveArea_H + +#ifndef STANDALONE +#endif + +using namespace std; + +class MuonEffectiveArea{ +public: + MuonEffectiveArea(); + ~MuonEffectiveArea(); + + enum MuonEffectiveAreaType { + kMuMiniIso03 + }; + + enum MuonEffectiveAreaTarget { + kMuEANoCorr, + kMuEASpring15_25ns + }; + + static Double_t GetMuonEffectiveArea(MuonEffectiveAreaType type, Double_t MuEta, + MuonEffectiveAreaTarget EffectiveAreaTarget = kMuEASpring15_25ns) { + + Double_t EffectiveArea = 0; + + + if (EffectiveAreaTarget == kMuEANoCorr) { + return 0.0; + } + + //2015 Spring15 Effective Areas + else if (EffectiveAreaTarget == kMuEASpring15_25ns) { + if (type == kMuMiniIso03){ + if (fabs(MuEta) >= 0.0 && fabs(MuEta) < 0.8 ) EffectiveArea = 0.0735; + if (fabs(MuEta) >= 0.8 && fabs(MuEta) < 1.3 ) EffectiveArea = 0.0619; + if (fabs(MuEta) >= 1.3 && fabs(MuEta) < 2.0 ) EffectiveArea = 0.0465; + if (fabs(MuEta) >= 2.0 && fabs(MuEta) < 2.2 ) EffectiveArea = 0.0433; + if (fabs(MuEta) >= 2.2 && fabs(MuEta) <= 2.5 ) EffectiveArea = 0.0577; + } + + } + + return EffectiveArea; + } +}; + +#endif diff --git a/test/zmumu/addEAMiniIso.cxx b/test/zmumu/addEAMiniIso.cxx new file mode 100644 index 00000000000..7bd2f52e16c --- /dev/null +++ b/test/zmumu/addEAMiniIso.cxx @@ -0,0 +1,54 @@ +#include "TTree.h" +#include "TFile.h" +#include "TStopwatch.h" +#include "MuonEffectiveArea.h" + +void addEAMiniIso() { + TTree *tIn = (TTree *) gFile->Get("tpTree/fitter_tree"); + Float_t pt, eta, chHad, nHad, phot, rho; + tIn->SetBranchAddress("pt", &pt); + tIn->SetBranchAddress("eta", &eta); + tIn->SetBranchAddress("miniIsoCharged", &chHad); + tIn->SetBranchAddress("miniIsoNeutrals", &nHad); + tIn->SetBranchAddress("miniIsoPhotons", &phot); + tIn->SetBranchAddress("fixedGridRhoFastjetCentralNeutral", &rho); + + TFile *fOut = new TFile("tnpZ_withEAIso.root", "RECREATE"); + fOut->mkdir("tpTree")->cd(); + TTree *tOut = tIn->CloneTree(0); + Float_t pfCombRelMiniIsoEACorr,pfCombAbsMiniIsoEACorr; + tOut->Branch("pfCombAbsMiniIsoEACorr", &pfCombAbsMiniIsoEACorr, "pfCombAbsMiniIsoEACorr/F"); + tOut->Branch("pfCombRelMiniIsoEACorr", &pfCombRelMiniIsoEACorr, "pfCombRelMiniIsoEACorr/F"); + + MuonEffectiveArea::MuonEffectiveAreaTarget effAreaTarget = MuonEffectiveArea::kMuEASpring15_25ns; // new 2015 + MuonEffectiveArea::MuonEffectiveAreaType effAreaType = MuonEffectiveArea::kMuMiniIso03; + + int step = tIn->GetEntries()/1000; + double evDenom = 100.0/double(tIn->GetEntries()); + TStopwatch timer; timer.Start(); + for (int i = 0, n = tIn->GetEntries(); i < n; ++i) { + tIn->GetEntry(i); + Float_t ea_tot = MuonEffectiveArea::GetMuonEffectiveArea(effAreaType, fabs(eta), effAreaTarget); + + pfCombAbsMiniIsoEACorr = (chHad + max(0.0, nHad - rho * ea_tot * ((10.0/min(max(pt, 50),200))/0.3)**2) + pfCombRelMiniIsoEACorr = pfCombAbsMiniIsoEACorr/pt; + if (i < 20) { + printf("muon with pt = %.2f, eta = %+5.2f:", pt, eta); + printf(" charged hadrons %6.3f, neutral hadrons %6.3f, photons %6.3f ", chHad, nHad, phot); + printf(" rho %6.3f, ea %6.3f", rho, ea_tot); + printf(" pfCombAbsIsoEAcorr %6.3f\n", pfCombAbsMiniIsoEACorr); + printf(" pfCombRelIsoEAcorr %6.3f\n", pfCombRelMiniIsoEACorr); + } + tOut->Fill(); + //if (i > 10000) break; + if ((i+1) % step == 0) { + double totalTime = timer.RealTime()/60.; timer.Continue(); + double fraction = double(i+1)/double(n+1), remaining = totalTime*(1-fraction)/fraction; + printf("Done %9d/%9d %5.1f%% (elapsed %5.1f min, remaining %5.1f min)\n", i, n, i*evDenom, totalTime, remaining); + fflush(stdout); + } + } + + tOut->AutoSave(); // according to root tutorial this is the right thing to do + fOut->Close(); +} From db4412b501cf1a3c6c974eb4e08b9b20ae85930a Mon Sep 17 00:00:00 2001 From: perrozzi Date: Thu, 15 Oct 2015 09:20:36 +0200 Subject: [PATCH 2/8] changed output filename --- test/zmumu/addEAMiniIso.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/zmumu/addEAMiniIso.cxx b/test/zmumu/addEAMiniIso.cxx index 7bd2f52e16c..3806e2bccfc 100644 --- a/test/zmumu/addEAMiniIso.cxx +++ b/test/zmumu/addEAMiniIso.cxx @@ -13,7 +13,7 @@ void addEAMiniIso() { tIn->SetBranchAddress("miniIsoPhotons", &phot); tIn->SetBranchAddress("fixedGridRhoFastjetCentralNeutral", &rho); - TFile *fOut = new TFile("tnpZ_withEAIso.root", "RECREATE"); + TFile *fOut = new TFile("tnpZ_withEAMiniIso.root", "RECREATE"); fOut->mkdir("tpTree")->cd(); TTree *tOut = tIn->CloneTree(0); Float_t pfCombRelMiniIsoEACorr,pfCombAbsMiniIsoEACorr; From df05c54ad9cf31f9654584ec9fe9dbc4c3ec0186 Mon Sep 17 00:00:00 2001 From: perrozzi Date: Tue, 20 Oct 2015 11:58:34 +0200 Subject: [PATCH 3/8] change tree variable name --- python/muon/tag_probe_muon_extraIso_cff.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/muon/tag_probe_muon_extraIso_cff.py b/python/muon/tag_probe_muon_extraIso_cff.py index 911f9ab7f07..c52dd871093 100644 --- a/python/muon/tag_probe_muon_extraIso_cff.py +++ b/python/muon/tag_probe_muon_extraIso_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms ExtraIsolationVariables = cms.PSet( - kt6RhoAll = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetAll"), # was RhoAll - kt6RhoAllCalo = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetAllCalo"), # was RhoAllCalo - kt6RhoPU = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetCentralChargedPileUp"), # was RhoPU - kt6RhoNeu05 = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetCentralNeutral"), # was RhoNeu05 - kt6RhoCentralCalo = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetCentralCalo"), # was RhoCentralCalo + fixedGridRhoFastjetAll = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetAll"), # was RhoAll / kt6RhoAll + fixedGridRhoFastjetAllCalo = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetAllCalo"), # was RhoAllCalo / kt6RhoAllCalo + fixedGridRhoFastjetCentralChargedPileUp = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetCentralChargedPileUp"), # was RhoPU / kt6RhoPU + fixedGridRhoFastjetCentralNeutral = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetCentralNeutral"), # was RhoNeu05 / kt6RhoNeu05 + fixedGridRhoFastjetCentralCalo = cms.InputTag("computeCorrectedIso", "fixedGridRhoFastjetCentralCalo"), # was RhoCentralCalo / kt6RhoCentralCalo ) From e03fa83a7fa7cd7019996989ecc4c558a504e19b Mon Sep 17 00:00:00 2001 From: perrozzi Date: Wed, 21 Oct 2015 19:43:14 +0200 Subject: [PATCH 4/8] bug fix in addEAMiniIso.cxx --- test/zmumu/addEAMiniIso.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/zmumu/addEAMiniIso.cxx b/test/zmumu/addEAMiniIso.cxx index 3806e2bccfc..e2ba67205a6 100644 --- a/test/zmumu/addEAMiniIso.cxx +++ b/test/zmumu/addEAMiniIso.cxx @@ -30,7 +30,7 @@ void addEAMiniIso() { tIn->GetEntry(i); Float_t ea_tot = MuonEffectiveArea::GetMuonEffectiveArea(effAreaType, fabs(eta), effAreaTarget); - pfCombAbsMiniIsoEACorr = (chHad + max(0.0, nHad - rho * ea_tot * ((10.0/min(max(pt, 50),200))/0.3)**2) + pfCombAbsMiniIsoEACorr = (chHad + max(0.0, nHad - rho * ea_tot * pow((10.0/min(max((double) pt, 50.),200.))/0.3,2))); pfCombRelMiniIsoEACorr = pfCombAbsMiniIsoEACorr/pt; if (i < 20) { printf("muon with pt = %.2f, eta = %+5.2f:", pt, eta); From f8d4118b37c0e18acb853a94f3f9a5dba368781f Mon Sep 17 00:00:00 2001 From: perrozzi Date: Thu, 22 Oct 2015 01:03:29 +0200 Subject: [PATCH 5/8] added pfCombAbsActivitydBCorr and pfCombRelActivitydBCorr definitions --- test/zmumu/addEAMiniIso.cxx | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/test/zmumu/addEAMiniIso.cxx b/test/zmumu/addEAMiniIso.cxx index e2ba67205a6..fba5f75d318 100644 --- a/test/zmumu/addEAMiniIso.cxx +++ b/test/zmumu/addEAMiniIso.cxx @@ -5,20 +5,26 @@ void addEAMiniIso() { TTree *tIn = (TTree *) gFile->Get("tpTree/fitter_tree"); - Float_t pt, eta, chHad, nHad, phot, rho; + Float_t pt, eta, chHad, nHad, phot, rho, activity_chHad, activity_PUchHad, activity_nHad, activity_phot; tIn->SetBranchAddress("pt", &pt); tIn->SetBranchAddress("eta", &eta); tIn->SetBranchAddress("miniIsoCharged", &chHad); tIn->SetBranchAddress("miniIsoNeutrals", &nHad); tIn->SetBranchAddress("miniIsoPhotons", &phot); + tIn->SetBranchAddress("activity_miniIsoCharged", &activity_chHad); + tIn->SetBranchAddress("activity_miniIsoPUCharged", &activity_PUchHad); + tIn->SetBranchAddress("activity_miniIsoNeutrals", &activity_nHad); + tIn->SetBranchAddress("activity_miniIsoPhotons", &activity_phot); tIn->SetBranchAddress("fixedGridRhoFastjetCentralNeutral", &rho); TFile *fOut = new TFile("tnpZ_withEAMiniIso.root", "RECREATE"); fOut->mkdir("tpTree")->cd(); TTree *tOut = tIn->CloneTree(0); - Float_t pfCombRelMiniIsoEACorr,pfCombAbsMiniIsoEACorr; + Float_t pfCombRelMiniIsoEACorr,pfCombAbsMiniIsoEACorr,pfCombRelActivitydBCorr,pfCombAbsActivitydBCorr; tOut->Branch("pfCombAbsMiniIsoEACorr", &pfCombAbsMiniIsoEACorr, "pfCombAbsMiniIsoEACorr/F"); tOut->Branch("pfCombRelMiniIsoEACorr", &pfCombRelMiniIsoEACorr, "pfCombRelMiniIsoEACorr/F"); + tOut->Branch("pfCombRelActivitydBCorr", &pfCombRelActivitydBCorr, "pfCombRelActivitydBCorr/F"); + tOut->Branch("pfCombAbsActivitydBCorr", &pfCombAbsActivitydBCorr, "pfCombAbsActivitydBCorr/F"); MuonEffectiveArea::MuonEffectiveAreaTarget effAreaTarget = MuonEffectiveArea::kMuEASpring15_25ns; // new 2015 MuonEffectiveArea::MuonEffectiveAreaType effAreaType = MuonEffectiveArea::kMuMiniIso03; @@ -32,12 +38,19 @@ void addEAMiniIso() { pfCombAbsMiniIsoEACorr = (chHad + max(0.0, nHad - rho * ea_tot * pow((10.0/min(max((double) pt, 50.),200.))/0.3,2))); pfCombRelMiniIsoEACorr = pfCombAbsMiniIsoEACorr/pt; + + pfCombAbsActivitydBCorr = (activity_chHad + max( (double) (activity_nHad + activity_phot - activity_PUchHad/2) , 0.0)); + pfCombRelActivitydBCorr = pfCombAbsActivitydBCorr/pt; + if (i < 20) { printf("muon with pt = %.2f, eta = %+5.2f:", pt, eta); printf(" charged hadrons %6.3f, neutral hadrons %6.3f, photons %6.3f ", chHad, nHad, phot); printf(" rho %6.3f, ea %6.3f", rho, ea_tot); - printf(" pfCombAbsIsoEAcorr %6.3f\n", pfCombAbsMiniIsoEACorr); - printf(" pfCombRelIsoEAcorr %6.3f\n", pfCombRelMiniIsoEACorr); + printf(" pfCombAbsMiniIsoEAcorr %6.3f\n", pfCombAbsMiniIsoEACorr); + printf(" pfCombRelMiniIsoEAcorr %6.3f\n", pfCombRelMiniIsoEACorr); + printf(" activity charged hadrons %6.3f, PU charged hadrons %6.3f, neutral hadrons %6.3f, photons %6.3f ", activity_chHad, activity_PUchHad, activity_nHad, activity_phot); + printf(" pfCombAbsActivitydBCorr %6.3f\n", pfCombAbsActivitydBCorr); + printf(" pfCombRelActivitydBCorr %6.3f\n", pfCombRelActivitydBCorr); } tOut->Fill(); //if (i > 10000) break; From d4ea3b8bbe84ffe5afaedc6afe6cd8a3c4f0ad76 Mon Sep 17 00:00:00 2001 From: Hugues Date: Sat, 24 Oct 2015 23:10:49 +0200 Subject: [PATCH 6/8] add the L2/L3/iso filters for Iso(Tk)Mu20 --- python/common_variables_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/python/common_variables_cff.py b/python/common_variables_cff.py index 21862c90a27..cbf1e6eac8d 100644 --- a/python/common_variables_cff.py +++ b/python/common_variables_cff.py @@ -280,6 +280,15 @@ L3fL1sMu16L1f0L2f10QL3Filtered18QL3pfhcalOldIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered18QL3pfhcalOldIsoRhoFilteredHB0p21HE0p22').empty()"), L3crIsoL1sMu16L1f0L2f10QL3f18QL3OldCaloIsotrkIsoFiltered0p09 = cms.string("!triggerObjectMatchesByFilter('hltL3crIsoL1sMu16L1f0L2f10QL3f18QL3OldCaloIsotrkIsoFiltered0p09').empty()"), L3fL1sMu16f0TkFiltered18Q = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered18Q').empty()"), + #add the muon 20 isolation varibles + L3fL1sMu16L1f0L2f10QL3Filtered20Q = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20Q').empty()"), + L3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p11EE0p08 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p11EE0p08').empty()"), + L3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22').empty()"), + L3crIsoL1sMu16L1f0L2f10QL3f20QL3trkIsoFiltered0p09 = cms.string("!triggerObjectMatchesByFilter('hltL3crIsoL1sMu16L1f0L2f10QL3f20QL3trkIsoFiltered0p09').empty()"), + L3fL1sMu16f0TkFiltered20Q = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20Q').empty()"), + L3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p11EE0p08 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p11EE0p08').empty()"), + L3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22').empty()"), + L3fL1sMu16L1f0Tkf20QL3trkIsoFiltered0p09 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0Tkf20QL3trkIsoFiltered0p09').empty()"), ) From e57a9056fe96de77fecec9108ba1252a4ca70fa5 Mon Sep 17 00:00:00 2001 From: Hugues Date: Sat, 24 Oct 2015 23:18:40 +0200 Subject: [PATCH 7/8] add the high pT muon ID --- plugins/HighPtMuonsInfo.cc | 27 +++++++++++++++++++++++++-- python/common_variables_cff.py | 4 ++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/plugins/HighPtMuonsInfo.cc b/plugins/HighPtMuonsInfo.cc index f350360c90a..164a7aeee06 100644 --- a/plugins/HighPtMuonsInfo.cc +++ b/plugins/HighPtMuonsInfo.cc @@ -40,6 +40,8 @@ class HighPtMuonsInfo : public edm::EDProducer { const std::vector & values, const std::string & label) const ; + reco::Muon::MuonTrackTypePair getMuonTrackTypePair(const reco::Muon & mu) const; + }; HighPtMuonsInfo::HighPtMuonsInfo(const edm::ParameterSet & iConfig) : @@ -69,11 +71,11 @@ HighPtMuonsInfo::produce(edm::Event & iEvent, const edm::EventSetup & iSetup) { const reco::Muon *mu1 = dynamic_cast(&*d1.masterClone()); if (mu1 == 0) throw cms::Exception("CorruptData") << "First daughter of candidate is not a ShallowClone of a reco::Muon\n"; - reco::Muon::MuonTrackTypePair tuneP1 = muon::tevOptimized(*mu1, 200, 40., 17., 0.25); + reco::Muon::MuonTrackTypePair tuneP1 = getMuonTrackTypePair(*mu1); const reco::Muon *mu2 = dynamic_cast(&*d2.masterClone()); if (mu2 == 0) throw cms::Exception("CorruptData") << "Second daughter of candidate is not a ShallowClone of a reco::Muon\n"; - reco::Muon::MuonTrackTypePair tuneP2 = muon::tevOptimized(*mu2, 200, 40., 17., 0.25); + reco::Muon::MuonTrackTypePair tuneP2 = getMuonTrackTypePair(*mu2); // Momentum and relative uncertainty pt[i] = tuneP2.first->pt(); @@ -116,6 +118,27 @@ HighPtMuonsInfo::writeValueMap(edm::Event &iEvent, iEvent.put(valMap, label); } +reco::Muon::MuonTrackTypePair +HighPtMuonsInfo::getMuonTrackTypePair(const reco::Muon & mu) const +{ + + reco::Muon::MuonTrackTypePair trackTypePair; + + if (mu.tunePMuonBestTrack().isAvailable()) + trackTypePair = std::make_pair(mu.tunePMuonBestTrack(),mu.tunePMuonBestTrackType()); + else if(mu.innerTrack().isAvailable()) + trackTypePair = std::make_pair(mu.innerTrack(),reco::Muon::InnerTrack); + else + trackTypePair = std::make_pair(mu.outerTrack(),reco::Muon::OuterTrack); + + return trackTypePair; + +} + + + + + #include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(HighPtMuonsInfo); diff --git a/python/common_variables_cff.py b/python/common_variables_cff.py index cbf1e6eac8d..1d85d606d31 100644 --- a/python/common_variables_cff.py +++ b/python/common_variables_cff.py @@ -143,6 +143,10 @@ "track.hitPattern.trackerLayersWithMeasurement > 5 && track.hitPattern.numberOfValidPixelHits > 0"), Loose = cms.string("isLooseMuon()"), Medium = cms.string("isPFMuon && innerTrack.validFraction >= 0.8 && ( isGlobalMuon && globalTrack.normalizedChi2 < 3 && combinedQuality.chi2LocalPosition < 12 && combinedQuality.trkKink < 20 && segmentCompatibility >= 0.303 || segmentCompatibility >= 0.451 )"), + HighPt = cms.string("isGlobalMuon && isTrackerMuon && globalTrack.hitPattern.numberOfValidMuonHits > 0 && "+ + "numberOfMatchedStations > 1 && track.hitPattern.numberOfValidPixelHits > 0 && "+ + "track.hitPattern.trackerLayersWithMeasurement > 5 && abs(dB) < 0.2 && "+ + "(tunePMuonBestTrack.ptError / tunePMuonBestTrack.pt) < 0.3"), HWWID = cms.string("( ((isGlobalMuon() && " " globalTrack.normalizedChi2 <10 &&" + " globalTrack.hitPattern.numberOfValidMuonHits > 0 && " + From 7ff235230a2c986f535c3d9a55bff7dddd428762 Mon Sep 17 00:00:00 2001 From: Hugues Date: Thu, 29 Oct 2015 10:55:09 +0100 Subject: [PATCH 8/8] update the trigger filter name to be able to use the Spring14 MC --- python/common_variables_cff.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/common_variables_cff.py b/python/common_variables_cff.py index 1d85d606d31..3c7acc096b5 100644 --- a/python/common_variables_cff.py +++ b/python/common_variables_cff.py @@ -286,12 +286,12 @@ L3fL1sMu16f0TkFiltered18Q = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered18Q').empty()"), #add the muon 20 isolation varibles L3fL1sMu16L1f0L2f10QL3Filtered20Q = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20Q').empty()"), - L3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p11EE0p08 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p11EE0p08').empty()"), - L3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22').empty()"), + L3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p11EE0p08 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p11EE0p08').empty()||!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfecalIsoRhoFilteredEB0p13EE0p10').empty()"), + L3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22').empty()||!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0L2f10QL3Filtered20QL3pfhcalIsoRhoFiltered0p23').empty()"), L3crIsoL1sMu16L1f0L2f10QL3f20QL3trkIsoFiltered0p09 = cms.string("!triggerObjectMatchesByFilter('hltL3crIsoL1sMu16L1f0L2f10QL3f20QL3trkIsoFiltered0p09').empty()"), L3fL1sMu16f0TkFiltered20Q = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20Q').empty()"), - L3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p11EE0p08 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p11EE0p08').empty()"), - L3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22').empty()"), + L3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p11EE0p08 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p11EE0p08').empty()||!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfecalIsoRhoFilteredEB0p13EE0p10').empty()"), + L3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFilteredHB0p21HE0p22').empty()||!triggerObjectMatchesByFilter('hltL3fL1sMu16f0TkFiltered20QL3pfhcalIsoRhoFiltered0p23').empty()"), L3fL1sMu16L1f0Tkf20QL3trkIsoFiltered0p09 = cms.string("!triggerObjectMatchesByFilter('hltL3fL1sMu16L1f0Tkf20QL3trkIsoFiltered0p09').empty()"), )