From 43aa20e8fbf2156e0ac0dcc1906660d5d219ef4c Mon Sep 17 00:00:00 2001 From: Silvio Date: Fri, 9 Oct 2015 17:09:09 +0200 Subject: [PATCH 1/2] code safe for missing collections --- DQMOffline/Trigger/src/BTVHLTOfflineSource.cc | 46 +++++++++---------- DQMOffline/Trigger/test/testTriggerBTV.py | 33 +++++++++---- 2 files changed, 46 insertions(+), 33 deletions(-) diff --git a/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc b/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc index cec0034620d63..4abad8f54d765 100644 --- a/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc +++ b/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc @@ -158,17 +158,17 @@ BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iS v->getMEhisto_Eta()->Fill(iter->first->eta()); DR = 9999.; - for ( reco::JetTagCollection::const_iterator iterO = offlineJetTagHandlerPF->begin(); iterO != offlineJetTagHandlerPF->end(); iterO++ ) - { - float CSV_offline = iterO->second; - if (CSV_offline<0) CSV_offline = -0.05; - DR = reco::deltaR(iterO->first->eta(),iterO->first->phi(),iter->first->eta(),iter->first->phi()); - if (DR<0.3) - { - v->getMEhisto_CSV_RECOvsHLT()->Fill(CSV_offline,CSV_online); continue; - } - } - + if(offlineJetTagHandlerPF.isValid()){ + for ( reco::JetTagCollection::const_iterator iterO = offlineJetTagHandlerPF->begin(); iterO != offlineJetTagHandlerPF->end(); iterO++ ){ + float CSV_offline = iterO->second; + if (CSV_offline<0) CSV_offline = -0.05; + DR = reco::deltaR(iterO->first->eta(),iterO->first->phi(),iter->first->eta(),iter->first->phi()); + if (DR<0.3) { + v->getMEhisto_CSV_RECOvsHLT()->Fill(CSV_offline,CSV_online); continue; + } + } + } + iEvent.getByToken(hltPFPVToken_, VertexHandler); if (VertexHandler.isValid()) { @@ -188,19 +188,19 @@ BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iS v->getMEhisto_Pt()->Fill(iter->first->pt()); v->getMEhisto_Eta()->Fill(iter->first->eta()); - DR = 9999.; - for ( reco::JetTagCollection::const_iterator iterO = offlineJetTagHandlerCalo->begin(); iterO != offlineJetTagHandlerCalo->end(); iterO++ ) - { - float CSV_offline = iterO->second; - if (CSV_offline<0) CSV_offline = -0.05; - - DR = reco::deltaR(iterO->first->eta(),iterO->first->phi(),iter->first->eta(),iter->first->phi()); - if (DR<0.3) - { - v->getMEhisto_CSV_RECOvsHLT()->Fill(CSV_offline,CSV_online); continue; - } - } + if(offlineJetTagHandlerCalo.isValid()){ + for ( reco::JetTagCollection::const_iterator iterO = offlineJetTagHandlerCalo->begin(); iterO != offlineJetTagHandlerCalo->end(); iterO++ ) + { + float CSV_offline = iterO->second; + if (CSV_offline<0) CSV_offline = -0.05; + DR = reco::deltaR(iterO->first->eta(),iterO->first->phi(),iter->first->eta(),iter->first->phi()); + if (DR<0.3) + { + v->getMEhisto_CSV_RECOvsHLT()->Fill(CSV_offline,CSV_online); continue; + } + } + } iEvent.getByToken(hltFastPVToken_, VertexHandler); if (VertexHandler.isValid()) diff --git a/DQMOffline/Trigger/test/testTriggerBTV.py b/DQMOffline/Trigger/test/testTriggerBTV.py index db36f1ac27f62..af791038e0521 100644 --- a/DQMOffline/Trigger/test/testTriggerBTV.py +++ b/DQMOffline/Trigger/test/testTriggerBTV.py @@ -14,18 +14,31 @@ process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-RECO/75X_mcRun2_asymptotic_v2-v1/00000/3EC1C553-BF36-E511-9BF4-00259059649C.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-RECO/75X_mcRun2_asymptotic_v2-v1/00000/A2489ECC-BE36-E511-88CB-002618943900.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-RECO/75X_mcRun2_asymptotic_v2-v1/00000/B40AE4FD-B436-E511-A272-003048FFD7A2.root' +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-RECO/75X_mcRun2_asymptotic_v2-v1/00000/3EC1C553-BF36-E511-9BF4-00259059649C.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-RECO/75X_mcRun2_asymptotic_v2-v1/00000/A2489ECC-BE36-E511-88CB-002618943900.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-RECO/75X_mcRun2_asymptotic_v2-v1/00000/B40AE4FD-B436-E511-A272-003048FFD7A2.root' + 'root://cms-xrd-global.cern.ch//store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-RECO/76X_mcRun2_asymptotic_v4-v1/00000/1A8546C9-5569-E511-A50B-0026189438F7.root', + 'root://cms-xrd-global.cern.ch//store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-RECO/76X_mcRun2_asymptotic_v4-v1/00000/82BFCA1B-4669-E511-87AA-0025905A60B8.root', + 'root://cms-xrd-global.cern.ch//store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-RECO/76X_mcRun2_asymptotic_v4-v1/00000/84BCCDC8-5569-E511-94EB-002618943854.root' ), secondaryFileNames = cms.untracked.vstring( - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/08BAC960-B436-E511-8306-0025905964C4.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/EA8F0E28-AA36-E511-9539-003048FFCBB0.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/483551C9-A936-E511-9A3E-002618943910.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/7603F5AF-B436-E511-AC18-0025905A610C.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/CE647DAD-B136-E511-BC87-0025905B8592.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/E2E857AB-B436-E511-A4EA-0025905A6138.root', - '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/089CF124-AA36-E511-A05F-0025905A605E.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/2ABA327E-2969-E511-A5A0-003048FFD736.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/46C054AB-2B69-E511-8CD3-0025905A60EE.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/5A3A6CFA-2769-E511-95AE-0025905B85A2.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/829C9381-3069-E511-943E-002590596484.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/84A3E212-3869-E511-A485-0025905938AA.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/8C278DF6-2769-E511-9A75-0025905A60BC.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/986B93AB-2B69-E511-8555-0025905A60EE.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/9A8902F8-2769-E511-A3AB-0025905B85EE.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/CE0D06A7-2B69-E511-A2F2-0025905964B4.root', + 'file:///afs/cern.ch/user/s/sdonato/eos/cms/store/relval/CMSSW_7_6_0_pre6/RelValTTbarLepton_13/GEN-SIM-DIGI-RAW-HLTDEBUG/76X_mcRun2_asymptotic_v4-v1/00000/D4F42F6F-2969-E511-AC2A-00261894390C.root' + # '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/08BAC960-B436-E511-8306-0025905964C4.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/EA8F0E28-AA36-E511-9539-003048FFCBB0.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/483551C9-A936-E511-9A3E-002618943910.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/7603F5AF-B436-E511-AC18-0025905A610C.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/CE647DAD-B136-E511-BC87-0025905B8592.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/E2E857AB-B436-E511-A4EA-0025905A6138.root', +# '/store/relval/CMSSW_7_6_0_pre2/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/75X_mcRun2_asymptotic_v2-v1/00000/089CF124-AA36-E511-A05F-0025905A605E.root', ), ) From d967a861ff4f145eb49cd041ccab115955e329cd Mon Sep 17 00:00:00 2001 From: Silvio Date: Fri, 9 Oct 2015 17:20:40 +0200 Subject: [PATCH 2/2] fix inputtag offline btag --- DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py index b8944385c5e7b..43f687587d705 100644 --- a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py +++ b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py @@ -10,7 +10,7 @@ triggerSummaryLabel = cms.InputTag("hltTriggerSummaryAOD","","HLT"), triggerResultsLabel = cms.InputTag("TriggerResults","","HLT"), offlineCSVLabelPF = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"), - offlineCSVLabelCalo = cms.InputTag("combinedInclusiveSecondaryVertexV2BJetTags"), + offlineCSVLabelCalo = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"), hltFastPVLabel = cms.InputTag("hltFastPrimaryVertex"), hltPFPVLabel = cms.InputTag("hltVerticesPFSelector"), hltCaloPVLabel = cms.InputTag("hltVerticesL3"),