diff --git a/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc b/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc index bee9ec6881ed0..3eef29e15c3d2 100644 --- a/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc +++ b/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc @@ -86,12 +86,9 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { float turnon_threshold_tight_; edm::EDGetTokenT offlineDiscrTokenb_; - edm::EDGetTokenT offlineDiscrTokenbb_; edm::EDGetTokenT> offlineIPToken_; - edm::EDGetTokenT> hltFastPVToken_; edm::EDGetTokenT> hltPFPVToken_; - edm::EDGetTokenT> hltCaloPVToken_; edm::EDGetTokenT> offlinePVToken_; edm::EDGetTokenT triggerResultsToken; @@ -99,15 +96,11 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { edm::EDGetTokenT triggerSummaryToken; edm::EDGetTokenT triggerSummaryFUToken; - edm::EDGetTokenT> shallowTagInfosTokenCalo_; edm::EDGetTokenT> shallowTagInfosTokenPf_; - edm::EDGetTokenT> SVTagInfosTokenCalo_; edm::EDGetTokenT> SVTagInfosTokenPf_; - edm::EDGetTokenT caloTagsToken_; edm::EDGetTokenT pfTagsToken_; - edm::Handle caloTags; edm::Handle pfTags; float minDecayLength_; @@ -161,6 +154,15 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { ObjME Discr_turnon_loose; ObjME Discr_turnon_medium; ObjME Discr_turnon_tight; + ObjME Pt_turnon_loose; + ObjME Pt_turnon_medium; + ObjME Pt_turnon_tight; + ObjME Eta_turnon_loose; + ObjME Eta_turnon_medium; + ObjME Eta_turnon_tight; + ObjME Phi_turnon_loose; + ObjME Phi_turnon_medium; + ObjME Phi_turnon_tight; MonitorElement* PVz = nullptr; MonitorElement* fastPVz = nullptr; MonitorElement* PVz_HLTMinusRECO = nullptr; @@ -247,13 +249,9 @@ BTVHLTOfflineSource::BTVHLTOfflineSource(const edm::ParameterSet& iConfig) turnon_threshold_medium_(iConfig.getParameter("turnon_threshold_medium")), turnon_threshold_tight_(iConfig.getParameter("turnon_threshold_tight")), offlineDiscrTokenb_(consumes(iConfig.getParameter("offlineDiscrLabelb"))), - offlineDiscrTokenbb_( - consumes(iConfig.getParameter("offlineDiscrLabelbb"))), offlineIPToken_(consumes>(iConfig.getParameter("offlineIPLabel"))), - hltFastPVToken_(consumes>(iConfig.getParameter("hltFastPVLabel"))), hltPFPVToken_(consumes>(iConfig.getParameter("hltPFPVLabel"))), - hltCaloPVToken_(consumes>(iConfig.getParameter("hltCaloPVLabel"))), offlinePVToken_(consumes>(iConfig.getParameter("offlinePVLabel"))), triggerResultsToken(consumes(triggerResultsLabel_)), triggerResultsFUToken(consumes( @@ -261,14 +259,9 @@ BTVHLTOfflineSource::BTVHLTOfflineSource(const edm::ParameterSet& iConfig) triggerSummaryToken(consumes(triggerSummaryLabel_)), triggerSummaryFUToken(consumes( edm::InputTag(triggerSummaryLabel_.label(), triggerSummaryLabel_.instance(), std::string("FU")))), - shallowTagInfosTokenCalo_( - consumes>(edm::InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"))), shallowTagInfosTokenPf_( consumes>(edm::InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfos"))), - SVTagInfosTokenCalo_(consumes>( - edm::InputTag("hltInclusiveSecondaryVertexFinderTagInfos"))), SVTagInfosTokenPf_(consumes>(edm::InputTag("hltDeepSecondaryVertexTagInfosPF"))), - caloTagsToken_(consumes(iConfig.getParameter("onlineDiscrLabelCalo"))), pfTagsToken_(consumes(iConfig.getParameter("onlineDiscrLabelPF"))), minDecayLength_(iConfig.getParameter("minDecayLength")), maxDecayLength_(iConfig.getParameter("maxDecayLength")), @@ -324,9 +317,6 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu } } - edm::Handle caloTags; - iEvent.getByToken(caloTagsToken_, caloTags); - edm::Handle pfTags; iEvent.getByToken(pfTagsToken_, pfTags); @@ -335,9 +325,6 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu Handle offlineJetTagHandlerb; iEvent.getByToken(offlineDiscrTokenb_, offlineJetTagHandlerb); - Handle offlineJetTagHandlerbb; - iEvent.getByToken(offlineDiscrTokenbb_, offlineJetTagHandlerbb); - Handle> offlineIPTagHandle; iEvent.getByToken(offlineIPToken_, offlineIPTagHandle); @@ -352,7 +339,6 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu return; edm::Handle> jetSVTagsCollPF; - edm::Handle> jetSVTagsCollCalo; for (auto& v : hltPathsAll_) { unsigned index = triggerNames.triggerIndex(v.getPath()); @@ -366,16 +352,11 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu continue; } - if (v.getTriggerType() == "PF") { - iEvent.getByToken(SVTagInfosTokenPf_, jetSVTagsCollPF); - } else { - iEvent.getByToken(SVTagInfosTokenCalo_, jetSVTagsCollCalo); - } + iEvent.getByToken(SVTagInfosTokenPf_, jetSVTagsCollPF); // PF and Calo btagging - if ((v.getTriggerType() == "PF" && pfTags.isValid()) || - (v.getTriggerType() == "Calo" && caloTags.isValid() && !caloTags->empty())) { - const auto& iter = (v.getTriggerType() == "PF") ? pfTags->begin() : caloTags->begin(); + if (v.getTriggerType() == "PF" && pfTags.isValid()) { + const auto& iter = pfTags->begin(); float Discr_online = iter->second; if (Discr_online < 0) @@ -390,18 +371,9 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu float DR = reco::deltaR(iterOffb.first->eta(), iterOffb.first->phi(), iter->first->eta(), iter->first->phi()); if (DR < 0.3) { float Discr_offline = iterOffb.second; - - // offline probb and probbb must be added (if probbb isn't specified, it'll just use probb) - if (offlineJetTagHandlerbb.isValid()) { - for (auto const& iterOffbb : *offlineJetTagHandlerbb) { - DR = reco::deltaR( - iterOffbb.first->eta(), iterOffbb.first->phi(), iter->first->eta(), iter->first->phi()); - if (DR < 0.3) { - Discr_offline += iterOffbb.second; - break; - } - } - } + float Pt_offline = iterOffb.first->pt(); + float Eta_offline = iterOffb.first->eta(); + float Phi_offline = iterOffb.first->phi(); if (Discr_offline < 0) Discr_offline = -0.05; @@ -412,12 +384,36 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu v.Discr_turnon_medium.denominator->Fill(Discr_offline); v.Discr_turnon_tight.denominator->Fill(Discr_offline); - if (Discr_online > turnon_threshold_loose_) + v.Pt_turnon_loose.denominator->Fill(Pt_offline); + v.Pt_turnon_medium.denominator->Fill(Pt_offline); + v.Pt_turnon_tight.denominator->Fill(Pt_offline); + + v.Eta_turnon_loose.denominator->Fill(Eta_offline); + v.Eta_turnon_medium.denominator->Fill(Eta_offline); + v.Eta_turnon_tight.denominator->Fill(Eta_offline); + + v.Phi_turnon_loose.denominator->Fill(Phi_offline); + v.Phi_turnon_medium.denominator->Fill(Phi_offline); + v.Phi_turnon_tight.denominator->Fill(Phi_offline); + + if (Discr_online > turnon_threshold_loose_) { v.Discr_turnon_loose.numerator->Fill(Discr_offline); - if (Discr_online > turnon_threshold_medium_) + v.Pt_turnon_loose.numerator->Fill(Pt_offline); + v.Eta_turnon_loose.numerator->Fill(Eta_offline); + v.Phi_turnon_loose.numerator->Fill(Phi_offline); + } + if (Discr_online > turnon_threshold_medium_) { v.Discr_turnon_medium.numerator->Fill(Discr_offline); - if (Discr_online > turnon_threshold_tight_) + v.Pt_turnon_medium.numerator->Fill(Pt_offline); + v.Eta_turnon_medium.numerator->Fill(Eta_offline); + v.Phi_turnon_medium.numerator->Fill(Phi_offline); + } + if (Discr_online > turnon_threshold_tight_) { v.Discr_turnon_tight.numerator->Fill(Discr_offline); + v.Pt_turnon_tight.numerator->Fill(Pt_offline); + v.Eta_turnon_tight.numerator->Fill(Eta_offline); + v.Phi_turnon_tight.numerator->Fill(Phi_offline); + } break; } @@ -425,8 +421,7 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu } ///offline bool pfSVTagCollValid = (v.getTriggerType() == "PF" && jetSVTagsCollPF.isValid()); - bool caloSVTagCollValid = (v.getTriggerType() == "Calo" && jetSVTagsCollCalo.isValid()); - if (offlineIPTagHandle.isValid() && (pfSVTagCollValid || caloSVTagCollValid)) { + if (offlineIPTagHandle.isValid() && pfSVTagCollValid) { std::vector offlineIP3D; std::vector offlineIP3DSig; std::vector offlineTracks = getOfflineBTagTracks( @@ -437,9 +432,6 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu if (pfSVTagCollValid) onlineTracks = getOnlineBTagTracks( iter->first->eta(), iter->first->phi(), jetSVTagsCollPF, onlineIP3D, onlineIP3DSig); - if (caloSVTagCollValid) - onlineTracks = getOnlineBTagTracks( - iter->first->eta(), iter->first->phi(), jetSVTagsCollCalo, onlineIP3D, onlineIP3DSig); for (unsigned int iOffTrk = 0; iOffTrk < offlineTracks.size(); ++iOffTrk) { const reco::Track* offTrk = offlineTracks.at(iOffTrk); @@ -504,36 +496,18 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu } } - if (v.getTriggerType() == "PF") { - iEvent.getByToken(hltPFPVToken_, VertexHandler); - } else { - iEvent.getByToken(hltFastPVToken_, VertexHandler); - } + iEvent.getByToken(hltPFPVToken_, VertexHandler); if (VertexHandler.isValid()) { v.PVz->Fill(VertexHandler->begin()->z()); if (offlineVertexHandler.isValid()) { v.PVz_HLTMinusRECO->Fill(VertexHandler->begin()->z() - offlineVertexHandler->begin()->z()); } } - } // caloTagsValid or PFTagsValid - - // specific to Calo b-tagging - if (caloTags.isValid() && v.getTriggerType() == "Calo" && !caloTags->empty()) { - iEvent.getByToken(hltCaloPVToken_, VertexHandler); - if (VertexHandler.isValid()) { - v.fastPVz->Fill(VertexHandler->begin()->z()); - if (offlineVertexHandler.isValid()) { - v.fastPVz_HLTMinusRECO->Fill(VertexHandler->begin()->z() - offlineVertexHandler->begin()->z()); - } - } - } + } // PFTagsValid // additional plots from tag info collections ///////////////////////////////////////////// - edm::Handle> shallowTagInfosCalo; - iEvent.getByToken(shallowTagInfosTokenCalo_, shallowTagInfosCalo); - edm::Handle> shallowTagInfosPf; iEvent.getByToken(shallowTagInfosTokenPf_, shallowTagInfosPf); @@ -544,9 +518,8 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu // iEvent.getByToken(pfTagInfosToken_, pfTagInfos); // first try to get info from shallowTagInfos ... - if ((v.getTriggerType() == "PF" && shallowTagInfosPf.isValid()) || - (v.getTriggerType() == "Calo" && shallowTagInfosCalo.isValid())) { - const auto& shallowTagInfoCollection = (v.getTriggerType() == "PF") ? shallowTagInfosPf : shallowTagInfosCalo; + if (v.getTriggerType() == "PF" && shallowTagInfosPf.isValid()) { + const auto& shallowTagInfoCollection = shallowTagInfosPf; for (const auto& shallowTagInfo : *shallowTagInfoCollection) { const auto& tagVars = shallowTagInfo.taggingVariables(); @@ -851,6 +824,42 @@ void BTVHLTOfflineSource::bookHistograms(DQMStore::IBooker& iBooker, edm::Run co title = "turn-on with tight threshold " + trigPath; v.bookME(iBooker, v.Discr_turnon_tight, histoname, title, 22, -0.1, 1.); + histoname = "Turnon_loose_Pt"; + title = "turn-on with loose threshold " + trigPath; + v.bookME(iBooker, v.Pt_turnon_loose, histoname, title, 50, 0., 500.); + + histoname = "Turnon_medium_Pt"; + title = "turn-on with medium threshold " + trigPath; + v.bookME(iBooker, v.Pt_turnon_medium, histoname, title, 50, 0., 500.); + + histoname = "Turnon_tight_Pt"; + title = "turn-on with tight threshold " + trigPath; + v.bookME(iBooker, v.Pt_turnon_tight, histoname, title, 50, 0., 500.); + + histoname = "Turnon_loose_Eta"; + title = "turn-on with loose threshold " + trigPath; + v.bookME(iBooker, v.Eta_turnon_loose, histoname, title, 60, -3., 3.); + + histoname = "Turnon_medium_Eta"; + title = "turn-on with medium threshold " + trigPath; + v.bookME(iBooker, v.Eta_turnon_medium, histoname, title, 60, -3., 3.); + + histoname = "Turnon_tight_Eta"; + title = "turn-on with tight threshold " + trigPath; + v.bookME(iBooker, v.Eta_turnon_tight, histoname, title, 60, -3., 3.); + + histoname = "Turnon_loose_Phi"; + title = "turn-on with loose threshold " + trigPath; + v.bookME(iBooker, v.Phi_turnon_loose, histoname, title, 60, -3., 3.); + + histoname = "Turnon_medium_Phi"; + title = "turn-on with medium threshold " + trigPath; + v.bookME(iBooker, v.Phi_turnon_medium, histoname, title, 60, -3., 3.); + + histoname = "Turnon_tight_Phi"; + title = "turn-on with tight threshold " + trigPath; + v.bookME(iBooker, v.Phi_turnon_tight, histoname, title, 60, -3., 3.); + histoname = labelname + "_PVz"; title = "online z(PV) " + trigPath; v.PVz = iBooker.book1D(histoname.c_str(), title.c_str(), 80, -20, 20); diff --git a/DQMOffline/Trigger/plugins/BTagAndProbe.cc b/DQMOffline/Trigger/plugins/BTagAndProbe.cc index 55adf0049eb3c..7db9b0b29628e 100644 --- a/DQMOffline/Trigger/plugins/BTagAndProbe.cc +++ b/DQMOffline/Trigger/plugins/BTagAndProbe.cc @@ -691,7 +691,7 @@ void BTagAndProbe::analyze(edm::Event const& iEvent, edm::EventSetup const& iSet edm::Handle > shallowTagInfos; iEvent.getByToken(shallowTagInfosToken_, shallowTagInfos); if (!shallowTagInfos.isValid()) { - edm::LogWarning("BTagAndProbe") << "shallow tag handle not valid, will skip event \n"; + //edm::LogWarning("BTagAndProbe") << "shallow tag handle not valid, will skip event \n"; return; } @@ -1100,8 +1100,8 @@ void BTagAndProbe::fillDescriptions(edm::ConfigurationDescriptions& descriptions desc.add("electrons", edm::InputTag("gedGsfElectrons")); desc.add("elecID", edm::InputTag("egmGsfElectronIDsForDQM:cutBasedElectronID-RunIIIWinter22-V1-tight")); - desc.add >( - "btagAlgos", {edm::InputTag("pfDeepCSVJetTags:probb"), edm::InputTag("pfDeepCSVJetTags:probbb")}); + desc.add >("btagAlgos", + {edm::InputTag("pfParticleNetAK4DiscriminatorsJetTagsForRECO:BvsAll")}); desc.add("jetSelection", "pt > 30"); desc.add("eleSelection", "pt > 0 && abs(eta) < 2.5"); diff --git a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py index 5734f718a7d7f..e8067e4d6dd33 100644 --- a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py +++ b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py @@ -10,18 +10,14 @@ triggerSummaryLabel = cms.InputTag("hltTriggerSummaryAOD", "", "HLT"), triggerResultsLabel = cms.InputTag("TriggerResults", "", "HLT"), - onlineDiscrLabelPF = cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsPF", "probb"), - onlineDiscrLabelCalo = cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsCalo", "probb"), - offlineDiscrLabelb = cms.InputTag("pfDeepCSVJetTags", "probb"), - offlineDiscrLabelbb = cms.InputTag("pfDeepCSVJetTags", "probbb"), - hltFastPVLabel = cms.InputTag("hltFastPrimaryVertex"), + onlineDiscrLabelPF = cms.InputTag("hltParticleNetDiscriminatorsJetTags", "BvsAll"), + offlineDiscrLabelb = cms.InputTag("pfParticleNetAK4DiscriminatorsJetTagsForRECO", "BvsAll"), hltPFPVLabel = cms.InputTag("hltVerticesPFSelector"), - hltCaloPVLabel = cms.InputTag("hltVerticesL3"), offlinePVLabel = cms.InputTag("offlinePrimaryVertices"), offlineIPLabel = cms.InputTag("pfImpactParameterTagInfos"), - turnon_threshold_loose = cms.double(0.2), - turnon_threshold_medium = cms.double(0.5), - turnon_threshold_tight = cms.double(0.8), + turnon_threshold_loose = cms.double(0.03), + turnon_threshold_medium = cms.double(0.2), + turnon_threshold_tight = cms.double(0.6), minDecayLength = cms.double(-9999.0), maxDecayLength = cms.double(5.0), minJetDistance = cms.double(0.0), @@ -31,13 +27,9 @@ pathPairs = cms.VPSet( cms.PSet( - pathname = cms.string("HLT_Mu12_DoublePFJets40_PFBTagDeepCSV_p71_v"), + pathname = cms.string("HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_v"), pathtype = cms.string("PF") ), - cms.PSet( - pathname = cms.string("HLT_Mu12_DoublePFJets40MaxDeta1p6_DoublePFBTagDeepCSV_p71_v"), - pathtype = cms.string("Calo") - ), ), ) @@ -57,20 +49,14 @@ referenceTrack = "referenceTracksForHLTBTag", monitoredBeamSpot = "hltOnlineBeamSpot", referenceBeamSpot = "offlineBeamSpot", - topDirName = "HLT/BTV/HLT_Mu12_DoublePFJets40_PFBTagDeepCSV_p71PF", + topDirName = "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30PF", referencePrimaryVertices = "offlinePrimaryVertices", monitoredPrimaryVertices = "hltVerticesPFSelector", - genericTriggerEventPSet = dict(hltPaths = ["HLT_Mu12_DoublePFJets40_PFBTagDeepCSV_p71*"]) -) - -bTagHLTTrackMonitoring_muPF2 = bTagHLTTrackMonitoring_muPF1.clone( - topDirName = "HLT/BTV/HLT_Mu12_DoublePFJets40MaxDeta1p6_DoublePFBTagDeepCSV_p71PF", - genericTriggerEventPSet = dict(hltPaths = ["HLT_Mu12_DoublePFJets40MaxDeta1p6_DoublePFBTagDeepCSV_p71*"]) + genericTriggerEventPSet = dict(hltPaths = ["HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_v*"]) ) bTagHLTTrackMonitoringSequence = cms.Sequence( cms.ignore(referenceTracksForHLTBTag) + bTagHLTTrackMonitoring_muPF1 - + bTagHLTTrackMonitoring_muPF2 ) diff --git a/DQMOffline/Trigger/python/BTagAndProbeMonitor_cfi.py b/DQMOffline/Trigger/python/BTagAndProbeMonitor_cfi.py index 8c3b00dfe10c8..ac2494830cc68 100644 --- a/DQMOffline/Trigger/python/BTagAndProbeMonitor_cfi.py +++ b/DQMOffline/Trigger/python/BTagAndProbeMonitor_cfi.py @@ -14,8 +14,8 @@ muons = "muons", # while pfIsolatedMuonsEI are reco::PFCandidate ! vertices = "offlinePrimaryVertices", - btagAlgos = ['pfDeepCSVJetTags:probb', 'pfDeepCSVJetTags:probbb'], - workingpoint = 0.8484, # Medium wp + btagAlgos = ['pfParticleNetAK4DiscriminatorsJetTagsForRECO:BvsAll'], + workingpoint = 0.2, # Medium wp leptJetDeltaRmin = 0.4, bJetDeltaEtaMax = 9999., diff --git a/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cff.py b/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cff.py index 39f09d45333ed..4cd374ba28e16 100644 --- a/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cff.py +++ b/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cff.py @@ -15,11 +15,10 @@ nmuons = 1, nelectrons = 1, nbjets = 2, - eleSelection = 'pt>10 & abs(eta)<2.5', + eleSelection = 'pt>25 & abs(eta)<2.4', muoSelection = 'pt>10 & abs(eta)<2.4', - bjetSelection = 'pt>20 & abs(eta)<2.4', - genericTriggerEventPSet = dict(hltPaths = ['HLT_Mu12_DoublePFJets40_PFBTagDeepCSV_p71_v*', - 'HLT_Mu12_DoublePFJets40MaxDeta1p6_DoublePFBTagDeepCSV_p71_v*']), + bjetSelection = 'pt>30 & abs(eta)<2.4', + genericTriggerEventPSet = dict(hltPaths = ['HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_v*']), #denGenericTriggerEventPSet = dict(hltPaths = ['HLT_Mu12_DoublePFJets40_PFBTagDeepCSV_p71_v*', # 'HLT_Mu12_DoublePFJets40MaxDeta1p6_DoublePFBTagDeepCSV_p71_v*']), debug = cms.bool(True), diff --git a/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cfi.py b/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cfi.py index f008eb13a4ac7..3f349eb30abd5 100644 --- a/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cfi.py +++ b/DQMOffline/Trigger/python/BTagAndProbeMonitoring_cfi.py @@ -9,8 +9,7 @@ elecID = cms.InputTag('egmGsfElectronIDsForDQM', 'cutBasedElectronID-RunIIIWinter22-V1-tight'), #jets = cms.InputTag('ak4PFJetsCHS'), btagAlgos = cms.VInputTag( - 'pfDeepCSVJetTags:probb', - 'pfDeepCSVJetTags:probbb' + 'pfParticleNetAK4DiscriminatorsJetTagsForRECO:BvsAll', ), jetSelection = cms.string('pt > 0'), eleSelection = cms.string('pt > 0 && abs(eta) < 2.5'), @@ -22,7 +21,7 @@ leptJetDeltaRmin = cms.double(0), bJetDeltaEtaMax = cms.double(9999), nbjets = cms.uint32(0), - workingpoint = cms.double(0.4941), + workingpoint = cms.double(0.2), applyLeptonPVcuts = cms.bool(False), debug = cms.bool(False), #numGenericTriggerEventPSet = cms.PSet( diff --git a/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py b/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py index b5d62b6998c7e..858c6c6f3b61f 100644 --- a/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py @@ -214,9 +214,7 @@ BTVEfficiency_TurnOnCurves = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring( - "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5*", - "HLT/BTV/HLT_DoublePFJets40_CaloBTagDeepCSV_p71*", - "HLT/BTV/HLT_Mu12_DoublePFJets40_CaloBTagDeepCSV_p71*", + "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30*", ), verbose = cms.untracked.uint32(0), resolution = cms.vstring(), @@ -224,14 +222,21 @@ "Turnon_loose 'turn-on (loose online OP);discriminator;efficiency' Turnon_loose_Discr_numerator Turnon_loose_Discr_denominator", "Turnon_medium 'turn-on (medium online OP);discriminator;efficiency' Turnon_medium_Discr_numerator Turnon_medium_Discr_denominator", "Turnon_tight 'turn-on (tight online OP);discriminator;efficiency' Turnon_tight_Discr_numerator Turnon_tight_Discr_denominator", + "Turnon_loose_pt 'turn-on (loose online OP);pt;efficiency' Turnon_loose_Pt_numerator Turnon_loose_Pt_denominator", + "Turnon_medium_pt 'turn-on (medium online OP);pt;efficiency' Turnon_medium_Pt_numerator Turnon_medium_Pt_denominator", + "Turnon_tight_pt 'turn-on (tight online OP);pt;efficiency' Turnon_tight_Pt_numerator Turnon_tight_Pt_denominator", + "Turnon_loose_eta 'turn-on (loose online OP);eta;efficiency' Turnon_loose_Eta_numerator Turnon_loose_Eta_denominator", + "Turnon_medium_eta 'turn-on (medium online OP);eta;efficiency' Turnon_medium_Eta_numerator Turnon_medium_Eta_denominator", + "Turnon_tight_eta 'turn-on (tight online OP);eta;efficiency' Turnon_tight_Eta_numerator Turnon_tight_Eta_denominator", + "Turnon_loose_phi 'turn-on (loose online OP);phi;efficiency' Turnon_loose_Phi_numerator Turnon_loose_Phi_denominator", + "Turnon_medium_phi 'turn-on (medium online OP);phi;efficiency' Turnon_medium_Phi_numerator Turnon_medium_Phi_denominator", + "Turnon_tight_phi 'turn-on (tight online OP);phi;efficiency' Turnon_tight_Phi_numerator Turnon_tight_Phi_denominator", ), ) BTVEfficiency_OnlineTrackEff = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring( - "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5*", - "HLT/BTV/HLT_DoublePFJets40_CaloBTagDeepCSV_p71*", - "HLT/BTV/HLT_Mu12_DoublePFJets40_CaloBTagDeepCSV_p71*", + "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30*", ), verbose = cms.untracked.uint32(0), resolution = cms.vstring(), @@ -245,9 +250,7 @@ BTVEfficiency_OnlineTrackFake = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring( - "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5*", - "HLT/BTV/HLT_DoublePFJets40_CaloBTagDeepCSV_p71*", - "HLT/BTV/HLT_Mu12_DoublePFJets40_CaloBTagDeepCSV_p71*", + "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30*", ), verbose = cms.untracked.uint32(0), resolution = cms.vstring(), @@ -262,9 +265,7 @@ from DQMOffline.Trigger.TrackingMonitoring_Client_cff import TrackToTrackEfficiencies BJetTrackToTrackEfficiencies = TrackToTrackEfficiencies.clone( - subDirs = ["HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5*", - "HLT/BTV/HLT_DoublePFJets40_CaloBTagDeepCSV_p71*", - "HLT/BTV/HLT_Mu12_DoublePFJets40_CaloBTagDeepCSV_p71*", + subDirs = ["HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30*", ] )