diff --git a/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py b/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py index b5d62b6998c7e..285472fc196ef 100644 --- a/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/BTaggingMonitoring_Client_cff.py @@ -60,6 +60,16 @@ ) ) +BTVEfficiency_BTagMu_DiJet_UParT = DQMEDHarvester("DQMGenericClient", + subDirs = cms.untracked.vstring("HLT/BTV/BTagMu_DiJet/*_UParTAK4"), + verbose = cms.untracked.uint32(0), + resolution = cms.vstring(), + efficiency = cms.vstring( + "effic_bjetCSV_1 'efficiency vs 1st b-jet UParT score; UParT score; efficiency' bjetCSV_1_numerator bjetCSV_1_denominator" + ) +) + + BTVEfficiency_BTagMu_Jet = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring("HLT/BTV/BTagMu_Jet/*"), verbose = cms.untracked.uint32(0), @@ -111,6 +121,15 @@ ) ) +BTVEfficiency_BTagMu_Jet_UParT = DQMEDHarvester("DQMGenericClient", + subDirs = cms.untracked.vstring("HLT/BTV/BTagMu_Jet/*_UParTAK4"), + verbose = cms.untracked.uint32(0), + resolution = cms.vstring(), + efficiency = cms.vstring( + "effic_bjetCSV_1 'efficiency vs 1st b-jet UParT score;UParT score; efficiency' bjetCSV_1_numerator bjetCSV_1_denominator" + ) +) + BTVEfficiency_BTagDiMu_Jet = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring("HLT/BTV/BTagDiMu_Jet/*"), @@ -170,6 +189,15 @@ ) ) +BTVEfficiency_BTagDiMu_Jet_UParT = DQMEDHarvester("DQMGenericClient", + subDirs = cms.untracked.vstring("HLT/BTV/BTagDiMu_Jet/*_UParTAK4"), + verbose = cms.untracked.uint32(0), + resolution = cms.vstring(), + efficiency = cms.vstring( + "effic_bjetCSV_1 'efficiency vs 1st b-jet UParT score; UParT score; efficiency' bjetCSV_1_numerator bjetCSV_1_denominator" + ) +) + BTVEfficiency_PFJet = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring("HLT/BTV/PFJet/*"), verbose = cms.untracked.uint32(0), @@ -212,6 +240,15 @@ ) ) +BTVEfficiency_PFJet_UParT = DQMEDHarvester("DQMGenericClient", + subDirs = cms.untracked.vstring("HLT/BTV/PFJet/*_UParTAK4"), + verbose = cms.untracked.uint32(0), + resolution = cms.vstring(), + efficiency = cms.vstring( + "effic_bjetCSV_1 'efficiency vs 1st b-jet UParT score; UParT score; efficiency' bjetCSV_1_numerator bjetCSV_1_denominator" + ) +) + BTVEfficiency_TurnOnCurves = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring( "HLT/BTV/HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5*", @@ -280,5 +317,9 @@ + BTVEfficiency_BTagMu_Jet_DeepJet + BTVEfficiency_BTagDiMu_Jet_DeepJet + BTVEfficiency_PFJet_DeepJet + + BTVEfficiency_BTagMu_DiJet_UParT + + BTVEfficiency_BTagMu_Jet_UParT + + BTVEfficiency_BTagDiMu_Jet_UParT + + BTVEfficiency_PFJet_UParT + BJetTrackToTrackEfficiencies ) diff --git a/DQMOffline/Trigger/python/BTaggingMonitoring_cff.py b/DQMOffline/Trigger/python/BTaggingMonitoring_cff.py index eb33172271032..2b4e72fc1fb57 100644 --- a/DQMOffline/Trigger/python/BTaggingMonitoring_cff.py +++ b/DQMOffline/Trigger/python/BTaggingMonitoring_cff.py @@ -28,6 +28,19 @@ histoPSet = dict(jetPtBinning = [0,10,15,20,30,50,70,100,150,200,400,700,1000,1500,3000]) ) +BTagMu_AK4DiJet20_Mu5_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/BTagMu_DiJet/AK4DiJet20_Mu5_UParTAK4', + nmuons = 1, + nelectrons = 0, + njets = 2, + muoSelection = 'pt>3 & abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 & globalTrack.hitPattern.numberOfValidMuonHits>0 & globalTrack.normalizedChi2<10', + jetSelection = 'pt>10 & abs(eta)<2.4', + bjetSelection = 'pt>5 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_BTagMu_AK4DiJet20_Mu5_v*']), + histoPSet = dict(jetPtBinning = [0,10,15,20,30,50,70,100,150,200,400,700,1000,1500,3000]) +) + BTagMu_AK4DiJet40_Mu5 = hltBTVmonitoring.clone( FolderName = 'HLT/BTV/BTagMu_DiJet/BTagMu_AK4DiJet40_Mu5', nmuons = 1, @@ -53,6 +66,19 @@ histoPSet = dict(jetPtBinning = [0,30,40,50,70,100,150,200,400,700,1000,1500,3000]) ) +BTagMu_AK4DiJet40_Mu5_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/BTagMu_DiJet/AK4DiJet40_Mu5_UParTAK4', + nmuons = 1, + nelectrons = 0, + njets = 2, + muoSelection = 'pt>3 & abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 & globalTrack.hitPattern.numberOfValidMuonHits>0 & globalTrack.normalizedChi2<10', + jetSelection = 'pt>30 & abs(eta)<2.4', + bjetSelection = 'pt>20 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_BTagMu_AK4DiJet40_Mu5_v*']), + histoPSet = dict(jetPtBinning = [0,30,40,50,70,100,150,200,400,700,1000,1500,3000]) +) + BTagMu_AK4DiJet70_Mu5 = hltBTVmonitoring.clone( FolderName = 'HLT/BTV/BTagMu_DiJet/BTagMu_AK4DiJet70_Mu5', nmuons = 1, @@ -76,6 +102,18 @@ histoPSet = dict(jetPtBinning = [0,50,60,70,80,90,100,150,200,400,700,1000,1500,3000]) ) +BTagMu_AK4DiJet70_Mu5_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/BTagMu_DiJet/AK4DiJet70_Mu5_UParTAK4', + nmuons = 1, + nelectrons = 0, + njets = 2, + muoSelection = 'pt>3 & abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 & globalTrack.hitPattern.numberOfValidMuonHits>0 & globalTrack.normalizedChi2<10', + jetSelection = 'pt>50 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_BTagMu_AK4DiJet70_Mu5_v*']), + histoPSet = dict(jetPtBinning = [0,50,60,70,80,90,100,150,200,400,700,1000,1500,3000]) +) + BTagMu_AK4DiJet110_Mu5 = hltBTVmonitoring.clone( FolderName = 'HLT/BTV/BTagMu_DiJet/BTagMu_AK4DiJet110_Mu5', nmuons = 1, @@ -99,6 +137,18 @@ histoPSet = dict(jetPtBinning = [0,90,100,110,120,130,150,200,400,700,1000,1500,3000]) ) +BTagMu_AK4DiJet110_Mu5_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/BTagMu_DiJet/AK4DiJet110_Mu5_UParTAK4', + nmuons = 1, + nelectrons = 0, + njets = 2, + muoSelection = 'pt>3 & abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 & globalTrack.hitPattern.numberOfValidMuonHits>0 & globalTrack.normalizedChi2<10', + jetSelection = 'pt>90 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_BTagMu_AK4DiJet110_Mu5_v*']), + histoPSet = dict(jetPtBinning = [0,90,100,110,120,130,150,200,400,700,1000,1500,3000]) +) + BTagMu_AK4DiJet170_Mu5 = hltBTVmonitoring.clone( FolderName = 'HLT/BTV/BTagMu_DiJet/BTagMu_AK4DiJet170_Mu5', nmuons = 1, @@ -122,6 +172,19 @@ histoPSet = dict(jetPtBinning = [0,150,160,170,180,190,200,400,700,1000,1500,3000]) ) +BTagMu_AK4DiJet170_Mu5_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/BTagMu_DiJet/AK4DiJet170_Mu5_UParTAK4', + nmuons = 1, + nelectrons = 0, + njets = 2, + muoSelection = 'pt>3 & abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 & globalTrack.hitPattern.numberOfValidMuonHits>0 & globalTrack.normalizedChi2<10', + jetSelection = 'pt>150 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_BTagMu_AK4DiJet170_Mu5_v*']), + histoPSet = dict(jetPtBinning = [0,150,160,170,180,190,200,400,700,1000,1500,3000]) +) + + BTagMu_AK4Jet300_Mu5 = hltBTVmonitoring.clone( FolderName = 'HLT/BTV/BTagMu_Jet/BTagMu_AK4Jet300_Mu5', nmuons = 1, @@ -145,6 +208,17 @@ histoPSet = dict(jetPtBinning = [0,250,280,300,320,360,400,700,1000,1500,3000]) ) +BTagMu_AK4Jet300_Mu5_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/BTagMu_Jet/BTagMu_AK4Jet300_Mu5_UParTAK4', + nmuons = 1, + nelectrons = 0, + njets = 1, + muoSelection = 'pt>3 & abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 & globalTrack.hitPattern.numberOfValidMuonHits>0 & globalTrack.normalizedChi2<10', + jetSelection = 'pt>250 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_BTagMu_AK4Jet300_Mu5_v*']), + histoPSet = dict(jetPtBinning = [0,250,280,300,320,360,400,700,1000,1500,3000]) +) #BTagMu AK8 BTagMu_AK8DiJet170_Mu5 = hltBTVmonitoring.clone( @@ -212,6 +286,18 @@ numGenericTriggerEventPSet = dict(hltPaths = ['HLT_PFJet40_v*']) ) +BTagMonitor_PFJet40_UParT = hltBTVmonitoring.clone( + FolderName = 'HLT/BTV/PFJet/PFJet40_UParTAK4', + nmuons = 0, + nelectrons = 0, + njets = 1, + jetSelection = 'pt>30 & abs(eta)<2.4', + bjetSelection = 'pt>20 & abs(eta)<2.4', + btagAlgos = ["pfUnifiedParticleTransformerAK4DiscriminatorsJetTags:BvsAll"], + histoPSet = dict(jetPtBinning = [0,30,35,40,45,50,60,70,100,150,200,400,700,1000,1500,3000]), + numGenericTriggerEventPSet = dict(hltPaths = ['HLT_PFJet40_v*']) +) + # PFJet AK8 BTagMonitor_AK8PFJet40 = hltBTVmonitoring.clone( FolderName = 'HLT/BTV/PFJet/AK8PFJet40', @@ -268,18 +354,24 @@ btagMonitorHLT = cms.Sequence( BTagMu_AK4DiJet20_Mu5 + BTagMu_AK4DiJet20_Mu5_DeepJet + + BTagMu_AK4DiJet20_Mu5_UParT + BTagMu_AK4DiJet40_Mu5 + BTagMu_AK4DiJet40_Mu5_DeepJet + + BTagMu_AK4DiJet40_Mu5_UParT + BTagMu_AK4DiJet70_Mu5 + BTagMu_AK4DiJet70_Mu5_DeepJet + + BTagMu_AK4DiJet70_Mu5_UParT + BTagMu_AK4DiJet110_Mu5 + BTagMu_AK4DiJet110_Mu5_DeepJet + + BTagMu_AK4DiJet110_Mu5_UParT + BTagMu_AK4DiJet170_Mu5 + BTagMu_AK4DiJet170_Mu5_DeepJet + + BTagMu_AK4DiJet170_Mu5_UParT + BTagMu_AK8DiJet170_Mu5 + BTagMu_AK8Jet170_DoubleMu5 + BTagMu_AK4Jet300_Mu5 + BTagMu_AK4Jet300_Mu5_DeepJet + + BTagMu_AK4Jet300_Mu5_UParT + BTagMu_AK8Jet300_Mu5 ) @@ -290,6 +382,7 @@ btvHLTDQMSourceExtra = cms.Sequence( BTagMonitor_PFJet40 + BTagMonitor_PFJet40_DeepJet + + BTagMonitor_PFJet40_UParT + BTagMonitor_AK8PFJet40 + BTagMonitor_PFJetFwd40_DeepJet + BTagMonitor_AK8PFJetFwd40_DeepJet diff --git a/RecoBTag/Configuration/python/RecoBTag_cff.py b/RecoBTag/Configuration/python/RecoBTag_cff.py index 006fc1db7d30e..e024244973a0c 100644 --- a/RecoBTag/Configuration/python/RecoBTag_cff.py +++ b/RecoBTag/Configuration/python/RecoBTag_cff.py @@ -114,7 +114,8 @@ pixelClusterTagInfos, pfParticleNetAK4TaskForRECO, - pfParticleNetTask + pfParticleNetTask, + pfUnifiedParticleTransformerAK4Task ) _pfCTaggingTask_run3 = cms.Task( inclusiveCandidateVertexingCvsLTask,