From e6680624b67024161538d41bd19eeaf6e0c97a71 Mon Sep 17 00:00:00 2001 From: Mia Date: Fri, 15 Sep 2017 17:35:30 +0200 Subject: [PATCH] disable most of the jet efficiency VS LS --- DQMOffline/Trigger/plugins/JetMonitor.cc | 72 ++++++++++--------- DQMOffline/Trigger/plugins/JetMonitor.h | 2 +- .../JetMETPromptMonitoring_Client_cff.py | 30 ++++---- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/DQMOffline/Trigger/plugins/JetMonitor.cc b/DQMOffline/Trigger/plugins/JetMonitor.cc index c2e89954d06eb..7683b16b68461 100644 --- a/DQMOffline/Trigger/plugins/JetMonitor.cc +++ b/DQMOffline/Trigger/plugins/JetMonitor.cc @@ -189,76 +189,78 @@ void JetMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup FillME(a_ME,jetpt_,jetphi_,jeteta_,ls,"denominator"); if (isBarrel( jeteta_ ) ) { - FillME(a_ME_HB,jetpt_,jetphi_,jeteta_,ls,"denominator"); + FillME(a_ME_HB,jetpt_,jetphi_,jeteta_,ls,"denominator", true, true, true, false); } - if (isEndCapP( jeteta_ ) ) + else if (isEndCapP( jeteta_ ) ) { - FillME(a_ME_HE,jetpt_,jetphi_,jeteta_,ls,"denominator"); - FillME(a_ME_HE_p,jetpt_,jetphi_,jeteta_,ls,"denominator"); + FillME(a_ME_HE, jetpt_,jetphi_,jeteta_,ls,"denominator",true, true, true, false); + FillME(a_ME_HE_p,jetpt_,jetphi_,jeteta_,ls,"denominator",true, true, true, false); } - if (isEndCapM( jeteta_ ) ) + else if (isEndCapM( jeteta_ ) ) { - FillME(a_ME_HE,jetpt_,jetphi_,jeteta_,ls,"denominator"); - FillME(a_ME_HE_m,jetpt_,jetphi_,jeteta_,ls,"denominator"); + FillME(a_ME_HE, jetpt_,jetphi_,jeteta_,ls,"denominator",true, true, true, false); + FillME(a_ME_HE_m,jetpt_,jetphi_,jeteta_,ls,"denominator",true, true, true, false); } - if (isForward( jeteta_ ) ) + else if (isForward( jeteta_ ) ) { - FillME(a_ME_HF,jetpt_,jetphi_,jeteta_,ls,"denominator"); + FillME(a_ME_HF,jetpt_,jetphi_,jeteta_,ls,"denominator"); } if (isHEP17( jeteta_, jetphi_ ) ) { - FillME(a_ME_HEP17,jetpt_,jetphi_,jeteta_,ls,"denominator",true,false,false); // doPhi, doEta, doEtaPhi + FillME(a_ME_HEP17,jetpt_,jetphi_,jeteta_,ls,"denominator",true,false,false, false); // doPhi, doEta, doEtaPhi // jetHEP17_AbsEtaVsPhi_.denominator->Fill(abs(jeteta_),jetphi_); jetHEP17_AbsEta_.denominator->Fill(abs(jeteta_)); } - if (isHEM17( jeteta_, jetphi_ ) ) + else if (isHEM17( jeteta_, jetphi_ ) ) { - FillME(a_ME_HEM17,jetpt_,jetphi_,jeteta_,ls,"denominator",true,false,false); // doPhi, doEta, doEtaPhi + FillME(a_ME_HEM17,jetpt_,jetphi_,jeteta_,ls,"denominator",true,false,false, false); // doPhi, doEta, doEtaPhi // jetHEM17_AbsEtaVsPhi_.denominator->Fill(abs(jeteta_),jetphi_); jetHEM17_AbsEta_.denominator->Fill(abs(jeteta_)); } - if (isHEP18( jeteta_, jetphi_ ) ) + else if (isHEP18( jeteta_, jetphi_ ) ) { - FillME(a_ME_HEP18,jetpt_,jetphi_,jeteta_,ls,"denominator",false,false,false); // doPhi, doEta, doEtaPhi + FillME(a_ME_HEP18,jetpt_,jetphi_,jeteta_,ls,"denominator",false,false,false, false); // doPhi, doEta, doEtaPhi } + + if (num_genTriggerEventFlag_->on() && ! num_genTriggerEventFlag_->accept( iEvent, iSetup) ) return; // Require Numerator // FillME(a_ME,jetpt_,jetphi_,jeteta_,ls,"numerator"); - if (isBarrel( jeteta_ ) ) { - FillME(a_ME_HB,jetpt_,jetphi_,jeteta_,ls,"numerator"); + FillME(a_ME_HB,jetpt_,jetphi_,jeteta_,ls,"numerator",true, true, true, false); } - if (isEndCapP( jeteta_ ) ) + else if (isEndCapP( jeteta_ ) ) { - FillME(a_ME_HE,jetpt_,jetphi_,jeteta_,ls,"numerator"); - FillME(a_ME_HE_p,jetpt_,jetphi_,jeteta_,ls,"numerator"); + FillME(a_ME_HE, jetpt_,jetphi_,jeteta_,ls,"numerator",true, true, true, false); + FillME(a_ME_HE_p,jetpt_,jetphi_,jeteta_,ls,"numerator",true, true, true, false); } - if (isEndCapM( jeteta_ ) ) + else if (isEndCapM( jeteta_ ) ) { - FillME(a_ME_HE,jetpt_,jetphi_,jeteta_,ls,"numerator"); - FillME(a_ME_HE_m,jetpt_,jetphi_,jeteta_,ls,"numerator"); + FillME(a_ME_HE, jetpt_,jetphi_,jeteta_,ls,"numerator",true, true, true, false); + FillME(a_ME_HE_m,jetpt_,jetphi_,jeteta_,ls,"numerator",true, true, true, false); } - if (isForward( jeteta_ ) ) + else if (isForward( jeteta_ ) ) { - FillME(a_ME_HF,jetpt_,jetphi_,jeteta_,ls,"numerator"); + FillME(a_ME_HF,jetpt_,jetphi_,jeteta_,ls,"numerator",true, true, true, false); } + if (isHEP17( jeteta_, jetphi_ ) ) { - FillME(a_ME_HEP17,jetpt_,jetphi_,jeteta_,ls,"numerator",true,false,false); // doPhi, doEta, doEtaPhi + FillME(a_ME_HEP17,jetpt_,jetphi_,jeteta_,ls,"numerator",true,false,false, false); // doPhi, doEta, doEtaPhi // jetHEP17_AbsEtaVsPhi_.numerator->Fill(abs(jeteta_),jetphi_); - jetHEP17_AbsEta_.numerator->Fill(abs(jeteta_)); + jetHEP17_AbsEta_.numerator->Fill(abs(jeteta_)); } - if (isHEM17( jeteta_, jetphi_ ) ) + else if (isHEM17( jeteta_, jetphi_ ) ) { - FillME(a_ME_HEM17,jetpt_,jetphi_,jeteta_,ls,"numerator",true,false,false); // doPhi, doEta, doEtaPhi - // jetHEM17_AbsEtaVsPhi_.numerator->Fill(abs(jeteta_),jetphi_); - jetHEM17_AbsEta_.numerator->Fill(abs(jeteta_)); + FillME(a_ME_HEM17,jetpt_,jetphi_,jeteta_,ls,"numerator",true,false,false,false); // doPhi, doEta, doEtaPhi + // jetHEM17_AbsEtaVsPhi_.numerator->Fill(abs(jeteta_),jetphi_); + jetHEM17_AbsEta_.numerator->Fill(abs(jeteta_)); } - if (isHEP18( jeteta_, jetphi_ ) ) + else if (isHEP18( jeteta_, jetphi_ ) ) { - FillME(a_ME_HEP18,jetpt_,jetphi_,jeteta_,ls,"numerator",false,false,false); // doPhi, doEta, doEtaPhi + FillME(a_ME_HEP18,jetpt_,jetphi_,jeteta_,ls,"numerator",false,false,false,false); // doPhi, doEta, doEtaPhi } } @@ -384,7 +386,7 @@ bool JetMonitor::isHEP18(double eta, double phi){ a_me[i].numerator = nullptr; } }*/ -void JetMonitor::FillME(JetME* a_me,double pt_, double phi_, double eta_, int ls_,const std::string& denu, bool doPhi, bool doEta, bool doEtaPhi){ +void JetMonitor::FillME(JetME* a_me,double pt_, double phi_, double eta_, int ls_,const std::string& denu, bool doPhi, bool doEta, bool doEtaPhi bool doVsLS){ std::string isDeno = ""; isDeno = denu; std::string DenoOrNume = ""; @@ -396,7 +398,7 @@ void JetMonitor::FillME(JetME* a_me,double pt_, double phi_, double eta_, int ls // 5 = eta vs phi, 6 = eta vs pt , 7 = abs(eta) , 8 = abs(eta) vs phi a_me[0].denominator->Fill(pt_);// pt a_me[1].denominator->Fill(pt_);// jetpT Threshold binning for pt - a_me[2].denominator->Fill(ls_,pt_);// pt vs ls + if ( doVsLS ) a_me[2].denominator->Fill(ls_,pt_);// pt vs ls if ( doPhi ) a_me[3].denominator->Fill(phi_);// phi if ( doEta ) a_me[4].denominator->Fill(eta_);// eta if ( doEtaPhi ) a_me[5].denominator->Fill(eta_,phi_);// eta vs phi @@ -406,7 +408,7 @@ void JetMonitor::FillME(JetME* a_me,double pt_, double phi_, double eta_, int ls { a_me[0].numerator->Fill(pt_);// pt a_me[1].numerator->Fill(pt_);// jetpT Threshold binning for pt - a_me[2].numerator->Fill(ls_,pt_);// pt vs ls + if ( doLS ) a_me[2].numerator->Fill(ls_,pt_);// pt vs ls if ( doPhi ) a_me[3].numerator->Fill(phi_);// phi if ( doEta ) a_me[4].numerator->Fill(eta_);// eat if ( doEtaPhi ) a_me[5].numerator->Fill(eta_,phi_);// eta vs phi diff --git a/DQMOffline/Trigger/plugins/JetMonitor.h b/DQMOffline/Trigger/plugins/JetMonitor.h index 89a24dd253e2b..836bd0fab4120 100644 --- a/DQMOffline/Trigger/plugins/JetMonitor.h +++ b/DQMOffline/Trigger/plugins/JetMonitor.h @@ -88,7 +88,7 @@ class JetMonitor : public DQMEDAnalyzer bool isHEP18(double eta, double phi); // -0.87< Phi < -1.22 //void FillME(std::vector v_me,std::vectorv_pt, std::vector v_phi); //Fill Histograms //void AutoNullPtr(JetME* a_me,const int len_); //Fill Histograms - void bookMESub(DQMStore::IBooker &,JetME* a_me,const int len_,const std::string& h_Name ,const std::string& h_Title, const std::string& h_subOptName, std::string h_subOptTitle, bool doPhi = true, bool doEta = true, bool doEtaPhi = true ); //Fill Histograms + void bookMESub(DQMStore::IBooker &,JetME* a_me,const int len_,const std::string& h_Name ,const std::string& h_Title, const std::string& h_subOptName, std::string h_subOptTitle, bool doPhi = true, bool doEta = true, bool doEtaPhi = true, bool doVsLS = true ); //Fill Histograms void FillME(JetME* a_me,double pt_, double phi_, double eta_, int ls_, const std::string& denu, bool doPhi = true, bool doEta = true, bool doEtaPhi = true); //Fill Histograms private: diff --git a/DQMOffline/Trigger/python/JetMETPromptMonitoring_Client_cff.py b/DQMOffline/Trigger/python/JetMETPromptMonitoring_Client_cff.py index 53c0e8f913870..4838387fc16c7 100644 --- a/DQMOffline/Trigger/python/JetMETPromptMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/JetMETPromptMonitoring_Client_cff.py @@ -66,13 +66,13 @@ ), efficiencyProfile = cms.untracked.vstring( "effic_pfjetpT_vs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_numerator pfjetpTVsLS_denominator", - "effic_pfjetpT_HBvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HB_numerator pfjetpTVsLS_HB_denominator", - "effic_pfjetpT_HEvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HE_numerator pfjetpTVsLS_HE_denominator", - "effic_pfjetpT_HFvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HF_numerator pfjetpTVsLS_HF_denominator", - "effic_pfjetpT_HEP17vs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HEP17_numerator pfjetpTVsLS_HEP17_denominator", - "effic_pfjetpT_HEM17vs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HEM17_numerator pfjetpTVsLS_HEM17_denominator", - "effic_pfjetpT_HE_mvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HE_m_numerator pfjetpTVsLS_HE_m_denominator", - "effic_pfjetpT_HE_pvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HE_p_numerator pfjetpTVsLS_HE_p_denominator", +# "effic_pfjetpT_HBvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HB_numerator pfjetpTVsLS_HB_denominator", +# "effic_pfjetpT_HEvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HE_numerator pfjetpTVsLS_HE_denominator", +# "effic_pfjetpT_HFvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HF_numerator pfjetpTVsLS_HF_denominator", +# "effic_pfjetpT_HEP17vs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HEP17_numerator pfjetpTVsLS_HEP17_denominator", +# "effic_pfjetpT_HEM17vs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HEM17_numerator pfjetpTVsLS_HEM17_denominator", +# "effic_pfjetpT_HE_mvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HE_m_numerator pfjetpTVsLS_HE_m_denominator", +# "effic_pfjetpT_HE_pvs_LS 'JET efficiency vs LS; LS; PF JET efficiency' pfjetpTVsLS_HE_p_numerator pfjetpTVsLS_HE_p_denominator", ), ) @@ -144,14 +144,14 @@ ), efficiencyProfile = cms.untracked.vstring( "effic_calojetpT_vs_LS 'JET efficiency vs LS; LS; Calo Jet efficiency' calojetpTVsLS_numerator calojetpTVsLS_denominator", - "effic_calojetpT_vs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_numerator calojetpTVsLS_denominator", - "effic_calojetpT_HBvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HB_numerator calojetpTVsLS_HB_denominator", - "effic_calojetpT_HEvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HE_numerator calojetpTVsLS_HE_denominator", - "effic_calojetpT_HFvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HF_numerator calojetpTVsLS_HF_denominator", - "effic_calojetpT_HEP17vs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HEP17_numerator calojetpTVsLS_HEP17_denominator", - "effic_calojetpT_HEM17vs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HEM17_numerator calojetpTVsLS_HEM17_denominator", - "effic_calojetpT_HE_mvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HE_m_numerator calojetpTVsLS_HE_m_denominator", - "effic_calojetpT_HE_pvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HE_p_numerator calojetpTVsLS_HE_p_denominator", +# "effic_calojetpT_vs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_numerator calojetpTVsLS_denominator", +# "effic_calojetpT_HBvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HB_numerator calojetpTVsLS_HB_denominator", +# "effic_calojetpT_HEvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HE_numerator calojetpTVsLS_HE_denominator", +# "effic_calojetpT_HFvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HF_numerator calojetpTVsLS_HF_denominator", +# "effic_calojetpT_HEP17vs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HEP17_numerator calojetpTVsLS_HEP17_denominator", +# "effic_calojetpT_HEM17vs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HEM17_numerator calojetpTVsLS_HEM17_denominator", +# "effic_calojetpT_HE_mvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HE_m_numerator calojetpTVsLS_HE_m_denominator", +# "effic_calojetpT_HE_pvs_LS 'JET efficiency vs LS; LS; Calo JET efficiency' calojetpTVsLS_HE_p_numerator calojetpTVsLS_HE_p_denominator", ), )