From e4e787488b9eeefb6f68351b1ed31517e3d1a168 Mon Sep 17 00:00:00 2001 From: Vincenzo Mastrapasqua Date: Mon, 17 Oct 2022 16:56:45 +0200 Subject: [PATCH 1/3] Update pathNames in BPH DQM + add plots for inclusive dimuon --- DQMOffline/Trigger/python/BPHMonitor_cff.py | 81 ++++++++++++--------- 1 file changed, 47 insertions(+), 34 deletions(-) diff --git a/DQMOffline/Trigger/python/BPHMonitor_cff.py b/DQMOffline/Trigger/python/BPHMonitor_cff.py index 94f1698182584..024d41708c2c4 100644 --- a/DQMOffline/Trigger/python/BPHMonitor_cff.py +++ b/DQMOffline/Trigger/python/BPHMonitor_cff.py @@ -13,7 +13,19 @@ muoSelection = "abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_Jpsi_L1_NoOS_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0_SQ"]), - denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Mu7p5_Track2_Jpsi_v*"]) + denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Mu7p5_L2Mu2_Jpsi_v*"]) + #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_SingleMu5_SQ OR L1_SingleMu7_SQ"]) +) + +Dimuon4_3_LowMass_tnp = hltBPHmonitoring.clone( + FolderName = 'HLT/BPH/DiMu4_3_LowMass_Inclusive/', + tnp = True, + enum = 1, + muoSelection_ref = "pt>4.5 && abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", + muoSelection = "abs(eta)<2.4 & isPFMuon & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_3_LowMass_v*"]), + #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0_SQ"]), + denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Mu4_L1DoubleMu_v*"]) #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_SingleMu5_SQ OR L1_SingleMu7_SQ"]) ) @@ -108,7 +120,7 @@ muoSelection_ref = "pt>4.5 && abs(eta)<1.5 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", muoSelection = "pt>3.5 && abs(eta)<1.5 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "abs(Eta)<1.5 && Pt>5.5 && M<5.9 && M>4.6", - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_3_Bs_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_3_LowMass_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS_dR_1p4"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_0er1p5_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS"]), @@ -171,7 +183,7 @@ enum = 4, muoSelection_ref = "pt>5 & abs(eta)<1.5 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "((M>1.1 & M<2.8) | (M>4.1 & M<4.7)) & abs(Eta)<1.5", - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS_dR_1p4"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_0er1p5_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS"]), @@ -189,7 +201,7 @@ muoSelection_ref = "pt>5 & abs(eta)<2.4 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "((M>1.1 & M<2.8) | (M>4.1 & M<4.7)) & abs(Eta)<2.4", max_dR = 1.2, - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS_dR_Max1p2"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_4_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms =["L1_DoubleMu4_SQ_OS"]), @@ -206,8 +218,8 @@ enum = 4, Jpsi = 1, muoSelection_ref = "pt>5 & abs(eta)<1.5 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", - DMSelection_ref = "abs(Eta)<1.5", - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_JpsiTrk_Displaced_v*"]), + DMSelection_ref = "M>2.9 & M<3.3 & abs(Eta)<1.5", + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS_dR_1p4"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_0er1p5_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS"]), @@ -224,9 +236,9 @@ enum = 4, Jpsi = 1, muoSelection_ref = "pt>5 & abs(eta)<2.4 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", - DMSelection_ref = "abs(Eta)<2.4", + DMSelection_ref = "M>2.9 & M<3.3 & abs(Eta)<2.4", max_dR = 1.2, - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_JpsiTrk_Displaced_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS_dR_Max1p2"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_4_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS"]), @@ -243,7 +255,7 @@ enum = 4, muoSelection_ref = "pt>5 & abs(eta)<1.5 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "M>3.4 & M<3.95 & abs(Eta)<1.5", - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_PsiPrimeTrk_Displaced_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS_dR_1p4"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_0er1p5_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS"]), @@ -262,7 +274,7 @@ muoSelection_ref = "pt>5 & abs(eta)<2.4 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "M>3.4 & M<3.95 & abs(Eta)<2.4", max_dR = 1.2, - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_PsiPrimeTrk_Displaced_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS_dR_Max1p2"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_4_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS"]), @@ -295,13 +307,13 @@ ) ) -Dimuon18_PsiPrime_dRcut = hltBPHmonitoring.clone( - FolderName = 'HLT/BPH/DiMu18_PsiPrime_L1_dR/', +Dimuon14_PsiPrime_dRcut = hltBPHmonitoring.clone( + FolderName = 'HLT/BPH/DiMu14_PsiPrime_L1_dR/', tnp = False, enum = 4, muoSelection_ref = "abs(eta)<1.5 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", - DMSelection_ref = "M>3.4 & M<3.95 & Pt>19 & abs(Eta)<1.5", - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon18_PsiPrime_v*"]), + DMSelection_ref = "M>3.4 & M<3.95 & Pt>15 & abs(Eta)<1.5", + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon14_PsiPrime_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS_dR_1p4"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_0er1p5_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu0er1p5_SQ_OS"]), @@ -337,14 +349,14 @@ ) -Dimuon18_PsiPrime_dRcut_low = hltBPHmonitoring.clone( - FolderName = 'HLT/BPH/DiMu18_PsiPrime_L1_dR_low/', +Dimuon14_PsiPrime_dRcut_low = hltBPHmonitoring.clone( + FolderName = 'HLT/BPH/DiMu14_PsiPrime_L1_dR_low/', tnp = False, enum = 4, muoSelection_ref = "pt>5 && abs(eta)<2.4 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "M>3.4 & M<3.95 & Pt>19 & abs(Eta)<2.4", max_dR = 1.2, - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon18_PsiPrime_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon14_PsiPrime_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS_dR_Max1p2"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_LowMass_L1_4_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS"]), @@ -372,14 +384,14 @@ #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4p5er2p0_SQ_OS"]) ) -Dimuon12_masscut2 = hltBPHmonitoring.clone( - FolderName = 'HLT/BPH/DiMu12_Upsilon_L1_masscut2/', +Dimuon10_masscut2 = hltBPHmonitoring.clone( + FolderName = 'HLT/BPH/DiMu10_Upsilon_L1_masscut2/', tnp = False, enum = 5, Upsilon = 1, muoSelection_ref = "pt>5 && abs(eta)<2.0 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", DMSelection_ref = "Pt>13 & abs(y)<1.5", - numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon12_Upsilon_y1p4_v*"]), + numGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon10_Upsilon_y1p4_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4p5er2p0_SQ_OS_Mass_7to18"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_Dimuon0_Upsilon_L1_4p5er2p0_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4p5er2p0_SQ_OS"]) @@ -599,9 +611,9 @@ tnp = False, enum = 9, muoSelection_ref = "pt>5 && abs(eta)<2.4 & isGlobalMuon & innerTrack.hitPattern.trackerLayersWithMeasurement>5 & innerTrack.hitPattern.numberOfValidPixelHits>0 ", - DMSelection_ref = "abs(Eta)<2.4", + DMSelection_ref = "M>2.9 & M<3.3 & abs(Eta)<2.4", trOrMu = True, - numGenericTriggerEventPSet = dict(hltPaths =["HLT_DoubleMu4_JpsiTrk_Displaced_v*"]), + numGenericTriggerEventPSet = dict(hltPaths =["HLT_DoubleMu4_MuMuTrk_Displaced_v*"]), #numGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS_dR_Max1p2 OR L1_DoubleMu0er1p5_SQ_OS_dR_Max1p4"]), denGenericTriggerEventPSet = dict(hltPaths = ["HLT_DoubleMu4_Jpsi_Displaced_v*"]), #denGenericTriggerEventPSet = dict(l1Algorithms = ["L1_DoubleMu4_SQ_OS_dR_Max1p2 OR L1_DoubleMu0er1p5_SQ_OS_dR_Max1p4"]) @@ -704,27 +716,28 @@ bphHLTmonitoring = cms.Sequence( Dimuon25_Jpsi_tnp + + Dimuon4_3_LowMass_tnp + Dimuon0_Jpsi_tnp - + Dimuon0_Jpsi_tnp1 - + Dimuon0_Jpsi_tnp2 +# + Dimuon0_Jpsi_tnp1 +# + Dimuon0_Jpsi_tnp2 + Dimuon0_Jpsi_OS + Dimuon0_er + Dimuon0_Upsilon_er + DMu4_3_Bs_dRcut + DMu4_3_Jpsi_dRcut + Dimuon14_Phi_dRcut -# + DMu4_LowMassNonResonantTrk_Displaced_dRcut -# + DMu4_JpsiTrk_Displaced_dRcut -# + DMu4_PsiPrimeTrk_Displaced_dRcut + + DMu4_LowMassNonResonantTrk_Displaced_dRcut + + DMu4_JpsiTrk_Displaced_dRcut + + DMu4_PsiPrimeTrk_Displaced_dRcut + Dimuon25_Jpsi_dRcut - + Dimuon18_PsiPrime_dRcut + + Dimuon14_PsiPrime_dRcut + Dimuon25_Jpsi_dRcut_low - + Dimuon18_PsiPrime_dRcut_low -# + DMu4_PsiPrimeTrk_Displaced_dRcut_low -# + DMu4_JpsiTrk_Displaced_dRcut_low -# + DMu4_LowMassNonResonantTrk_Displaced_dRcut_low + + Dimuon14_PsiPrime_dRcut_low + + DMu4_PsiPrimeTrk_Displaced_dRcut_low + + DMu4_JpsiTrk_Displaced_dRcut_low + + DMu4_LowMassNonResonantTrk_Displaced_dRcut_low + Dimuon20_masscut1 - + Dimuon12_masscut2 + + Dimuon10_masscut2 + Trimuon2_masscut4 + Trimuon2_masscut5 + Trimuon2_masscut6 @@ -743,7 +756,7 @@ + Dimuon0_addTrack_Jpsi + Dimuon0_addTrackTrack_Jpsi + DM2_Jpsi_addTrackTrack_Phi - + DM2_Jpsi_addTkMuTkMu_Phi +# + DM2_Jpsi_addTkMuTkMu_Phi + Dimuon0_addTrackMu_Onia + Dimuon0_addTrackMu_Phi1 #+ DimuonX_HLT_OS_Vtx From 5100e4a621e492036f33867d03b69488fd2d283e Mon Sep 17 00:00:00 2001 From: Vincenzo Mastrapasqua Date: Tue, 18 Oct 2022 11:57:34 +0200 Subject: [PATCH 2/3] update trigger names in RelVal code --- ...yFlavorValidationHarvestingSequence_cff.py | 56 +++++-------------- .../heavyFlavorValidationSequence_cff.py | 36 ++---------- 2 files changed, 20 insertions(+), 72 deletions(-) diff --git a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvestingSequence_cff.py b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvestingSequence_cff.py index f743fde3bdaeb..3004420a9aba4 100644 --- a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvestingSequence_cff.py +++ b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvestingSequence_cff.py @@ -7,7 +7,7 @@ MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_3_Bs_v') ) hfv2 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_3_Jpsi_Displaced_v') + MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_3_Jpsi_v') ) @@ -17,33 +17,9 @@ hfvTnP2 = heavyFlavorValidationHarvesting.clone( MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_L2Mu2_Upsilon_v') ) -hfvTnP3 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track2_Jpsi_v') -) -hfvTnP4 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track3p5_Jpsi_v') -) -hfvTnP5 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track7_Jpsi_v') -) -hfvTnP6 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track2_Upsilon_v') -) -hfvTnP7 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track3p5_Upsilon_v') -) -hfvTnP8 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track7_Upsilon_v') -) hfv7 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_JpsiTrk_Displaced_v') -) -hfv8 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v') -) -hfv9 = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v') + MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_MuMuTrk_Displaced_v') ) ### 2017 additions @@ -96,11 +72,11 @@ ) hfpsi = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon18_PsiPrime_v') + MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon14_PsiPrime_v') ) hfupsilon = heavyFlavorValidationHarvesting.clone( - MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon12_Upsilon_eta1p5_v') + MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon10_Upsilon_y1p4_v') ) @@ -110,17 +86,13 @@ cms.untracked.PSet( InputMEnames = cms.untracked.vstring( 'HLT_DoubleMu4_3_Bs_v/effPathDiglobAND_recoEtaPtY', - 'HLT_DoubleMu4_3_Jpsi_Displaced_v/effPathDiglobAND_recoEtaPtY', - 'HLT_DoubleMu4_JpsiTrk_Displaced_v/effPathDiglobAND_recoEtaPtY', - 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v/effPathDiglobAND_recoEtaPtY', - 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v/effPathDiglobAND_recoEtaPtY', + 'HLT_DoubleMu4_3_Jpsi_v/effPathDiglobAND_recoEtaPtY', + 'HLT_DoubleMu4_MuMuTrk_Displaced_v/effPathDiglobAND_recoEtaPtY', ), InputLabels = cms.untracked.vstring( 'HLT_DoubleMu4_3_Bs_v', - 'HLT_DoubleMu4_3_Jpsi_Displaced_v', - 'HLT_DoubleMu4_JpsiTrk_Displaced_v', - 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v', - 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v', + 'HLT_DoubleMu4_3_Jpsi_v', + 'HLT_DoubleMu4_MuMuTrk_Displaced_v', ), OutputMEname = cms.untracked.string('effPathGlob_recoLowPt') ) @@ -132,14 +104,14 @@ cms.untracked.PSet( InputMEnames = cms.untracked.vstring( 'HLT_Dimuon25_Jpsi_v/effPathDiglobAND_recoEtaPtY', - 'HLT_Dimuon18_PsiPrime_v/effPathDiglobAND_recoEtaPtY', - 'HLT_Dimuon12_Upsilon_eta1p5_v/effPathDiglobAND_recoEtaPtY', + 'HLT_Dimuon14_PsiPrime_v/effPathDiglobAND_recoEtaPtY', + 'HLT_Dimuon10_Upsilon_y1p4_v/effPathDiglobAND_recoEtaPtY', 'HLT_Mu30_TkMu0_Onia_v/effPathDiglobAND_recoEtaPtY' ), InputLabels = cms.untracked.vstring( 'HLT_Dimuon25_Jpsi_v', - 'HLT_Dimuon18_PsiPrime_v', - 'HLT_Dimuon12_Upsilon_eta1p5_v', + 'HLT_Dimuon14_PsiPrime_v', + 'HLT_Dimuon10_Upsilon_y1p4_v', 'HLT_Mu30_TkMu0_Onia_v' ), OutputMEname = cms.untracked.string('effPathGlob_recoHighPt') @@ -149,8 +121,8 @@ heavyFlavorValidationHarvestingSequence = cms.Sequence( hfv1+hfv2 - +hfvTnP1+hfvTnP2+hfvTnP3+hfvTnP4+hfvTnP5+hfvTnP6+hfvTnP7+hfvTnP8 - +hfv7+hfv8+hfv9 + +hfvTnP1+hfvTnP2 + +hfv7 + hfjpsiMuon + hfjpsiNoVertexing + hfjpsiNoVertexingNoOS diff --git a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationSequence_cff.py b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationSequence_cff.py index dddc67fb82b4d..3ddbf489ec31d 100644 --- a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationSequence_cff.py +++ b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationSequence_cff.py @@ -8,16 +8,10 @@ DimuonPtBins = cms.untracked.vdouble(0., 2., 4., 6., 8., 10., 12., 15., 25.) ) hfv2 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_DoubleMu4_3_Jpsi_Displaced_v") + TriggerPathName = cms.untracked.string("HLT_DoubleMu4_3_Jpsi_v") ) hfv3 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_DoubleMu4_JpsiTrk_Displaced_v") -) -hfv4 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_DoubleMu4_PsiPrimeTrk_Displaced_v") -) -hfv5 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v") + TriggerPathName = cms.untracked.string("HLT_DoubleMu4_MuMuTrk_Displaced_v") ) hfvTnP1 = hfv1.clone( @@ -26,24 +20,6 @@ hfvTnP2 = hfv1.clone( TriggerPathName = cms.untracked.string("HLT_Mu7p5_L2Mu2_Upsilon_v") ) -hfvTnP3 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track2_Jpsi_v") -) -hfvTnP4 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track3p5_Jpsi_v") -) -hfvTnP5 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track7_Jpsi_v") -) -hfvTnP6 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track2_Upsilon_v") -) -hfvTnP7 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track3p5_Upsilon_v") -) -hfvTnP8 = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track7_Upsilon_v") -) ## 2017 additions hfjpsiMuon = hfv1.clone( @@ -95,17 +71,17 @@ ) hfpsi = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Dimuon18_PsiPrime_v") + TriggerPathName = cms.untracked.string("HLT_Dimuon14_PsiPrime_v") ) hfupsilon = hfv1.clone( - TriggerPathName = cms.untracked.string("HLT_Dimuon12_Upsilon_eta1p5_v") + TriggerPathName = cms.untracked.string("HLT_Dimuon10_Upsilon_y1p4_v") ) heavyFlavorValidationSequence = cms.Sequence( - hfv1+hfv2+hfv3+hfv4+hfv5 - +hfvTnP1+hfvTnP2+hfvTnP3+hfvTnP4+hfvTnP5+hfvTnP6+hfvTnP7+hfvTnP8 + hfv1+hfv2+hfv3 + +hfvTnP1+hfvTnP2 + hfjpsiMuon + hfjpsiNoVertexing + hfjpsiNoVertexingNoOS From 0b3342714f1d1a50a64f0f0172e99dd96dbfefac Mon Sep 17 00:00:00 2001 From: Vincenzo Mastrapasqua Date: Wed, 19 Oct 2022 11:37:32 +0200 Subject: [PATCH 3/3] remove empty RelVal plots --- .../heavyFlavorValidationHarvesting_cfi.py | 72 +++++++++---------- .../HeavyFlavor/src/HeavyFlavorValidation.cc | 37 +++++++++- 2 files changed, 71 insertions(+), 38 deletions(-) diff --git a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvesting_cfi.py b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvesting_cfi.py index ac19d8afb6cdb..dbfdbe6280c94 100644 --- a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvesting_cfi.py +++ b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvesting_cfi.py @@ -5,34 +5,34 @@ MyDQMrootFolder = cms.untracked.string('HLT/BPH/HLT/HLT_Mu5'), Efficiencies = cms.untracked.VPSet( cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("globMuon_genEtaPt","genMuon_genEtaPt","effGlobGen_genEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt1Muon_recoEtaPt","globMuon_recoEtaPt","effFilt1Glob_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPt","globMuon_recoEtaPt","effFilt2Glob_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPt","globMuon_recoEtaPt","effFilt3Glob_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPt","globMuon_recoEtaPt","effFilt4Glob_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPt","globMuon_recoEtaPt","effFilt5Glob_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt1Muon_recoEtaPt","globMuon_recoEtaPt","effFilt1Glob_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPt","globMuon_recoEtaPt","effFilt2Glob_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPt","globMuon_recoEtaPt","effFilt3Glob_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPt","globMuon_recoEtaPt","effFilt4Glob_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPt","globMuon_recoEtaPt","effFilt5Glob_recoEtaPt") ), cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("pathMuon_recoEtaPt","globMuon_recoEtaPt","effPathGlob_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt2Filt1_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPt","filt2Muon_recoEtaPt","effFilt3Filt2_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPt","filt3Muon_recoEtaPt","effFilt4Filt3_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPt","filt4Muon_recoEtaPt","effFilt5Filt4_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt3Filt1_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt4Filt1_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt5Filt1_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt2Filt1_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPt","filt2Muon_recoEtaPt","effFilt3Filt2_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPt","filt3Muon_recoEtaPt","effFilt4Filt3_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPt","filt4Muon_recoEtaPt","effFilt5Filt4_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt3Filt1_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt4Filt1_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPt","filt1Muon_recoEtaPt","effFilt5Filt1_recoEtaPt") ), cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("globMuon_genEtaPhi","genMuon_genEtaPhi","effGlobGen_genEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt1Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt1Glob_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt2Glob_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt3Glob_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt4Glob_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt5Glob_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt1Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt1Glob_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt2Glob_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt3Glob_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt4Glob_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPhi","globMuon_recoEtaPhi","effFilt5Glob_recoEtaPhi") ), cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("pathMuon_recoEtaPhi","globMuon_recoEtaPhi","effPathGlob_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt2Filt1_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPhi","filt2Muon_recoEtaPhi","effFilt3Filt2_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPhi","filt3Muon_recoEtaPhi","effFilt4Filt3_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPhi","filt4Muon_recoEtaPhi","effFilt5Filt4_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt3Filt1_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt4Filt1_recoEtaPhi") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt5Filt1_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt2Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt2Filt1_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPhi","filt2Muon_recoEtaPhi","effFilt3Filt2_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPhi","filt3Muon_recoEtaPhi","effFilt4Filt3_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPhi","filt4Muon_recoEtaPhi","effFilt5Filt4_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt3Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt3Filt1_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt4Filt1_recoEtaPhi") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Muon_recoEtaPhi","filt1Muon_recoEtaPhi","effFilt5Filt1_recoEtaPhi") ), ################# DOUBLE ETA PT ###################### cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("globDimuon_genEtaPt","genDimuon_genEtaPt","effGlobDigenAND_genEtaPt") ), @@ -42,19 +42,19 @@ # cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt4Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt4DiglobOR_recoEtaPt") ), # cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("filt5Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt5DiglobOR_recoEtaPt") ), # cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("pathDimuon_recoEtaPt","globDimuon_recoEtaPt","effPathDiglobOR_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt1Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt1DiglobAND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt2Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt2DiglobAND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt3Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt3DiglobAND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt4Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt4DiglobAND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt5Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt5DiglobAND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt1Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt1DiglobAND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt2Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt2DiglobAND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt3Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt3DiglobAND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt4Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt4DiglobAND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt5Dimuon_recoEtaPt","globDimuon_recoEtaPt","effFilt5DiglobAND_recoEtaPt") ), cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diPathDimuon_recoEtaPt","globDimuon_recoEtaPt","effPathDiglobAND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt2Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt2Difilt1AND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt3Dimuon_recoEtaPt","diFilt2Dimuon_recoEtaPt","effFilt3Difilt2AND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt4Dimuon_recoEtaPt","diFilt3Dimuon_recoEtaPt","effFilt4Difilt3AND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt5Dimuon_recoEtaPt","diFilt4Dimuon_recoEtaPt","effFilt5Difilt4AND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt3Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt3Difilt1AND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt4Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt4Difilt1AND_recoEtaPt") ), - cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt5Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt5Difilt1AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt2Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt2Difilt1AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt3Dimuon_recoEtaPt","diFilt2Dimuon_recoEtaPt","effFilt3Difilt2AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt4Dimuon_recoEtaPt","diFilt3Dimuon_recoEtaPt","effFilt4Difilt3AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt5Dimuon_recoEtaPt","diFilt4Dimuon_recoEtaPt","effFilt5Difilt4AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt3Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt3Difilt1AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt4Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt4Difilt1AND_recoEtaPt") ), +# cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("diFilt5Dimuon_recoEtaPt","diFilt1Dimuon_recoEtaPt","effFilt5Difilt1AND_recoEtaPt") ), ################# DOUBLE RAPIDITY PT ###################### # cms.untracked.PSet( NumDenEffMEnames = cms.untracked.vstring("globDimuon_genRapPt","genDimuon_genRapPt","effGlobDigenAND_genRapPt") ), diff --git a/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc b/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc index 1fb42c4fa699a..626a14de2b858 100644 --- a/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc +++ b/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc @@ -224,7 +224,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, myBook2D(ibooker, "genMuon_genEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)"); myBook2D(ibooker, "globMuon_genEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)"); myBook2D(ibooker, "globMuon_recoEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)"); - + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dMuon_recoEtaPt", int(i + 1)), @@ -234,10 +234,12 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu pT (GeV)", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "pathMuon_recoEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)", triggerPathName); myBook2D(ibooker, "resultMuon_recoEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)"); // Eta Pt Single Resolution myBookProfile2D(ibooker, "resGlobGen_genEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBookProfile2D(ibooker, TString::Format("resFilt%dGlob_recoEtaPt", int(i + 1)), @@ -247,12 +249,14 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu pT (GeV)", filterNamesLevels[i].first); } + */ myBookProfile2D( ibooker, "resPathGlob_recoEtaPt", muonEtaBins, "#mu eta", muonPtBins, " #mu pT (GeV)", triggerPathName); // Eta Pt Double myBook2D(ibooker, "genDimuon_genEtaPt", dimuonEtaBins, "#mu#mu eta", dimuonPtBins, " #mu#mu pT (GeV)"); myBook2D(ibooker, "globDimuon_genEtaPt", dimuonEtaBins, "#mu#mu eta", dimuonPtBins, " #mu#mu pT (GeV)"); myBook2D(ibooker, "globDimuon_recoEtaPt", dimuonEtaBins, "#mu#mu eta", dimuonPtBins, " #mu#mu pT (GeV)"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dDimuon_recoEtaPt", int(i + 1)), @@ -262,9 +266,11 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu#mu pT (GeV)", filterNamesLevels[i].first); } + */ myBook2D( ibooker, "pathDimuon_recoEtaPt", dimuonEtaBins, "#mu#mu eta", dimuonPtBins, " #mu#mu pT (GeV)", triggerPathName); myBook2D(ibooker, "resultDimuon_recoEtaPt", dimuonEtaBins, "#mu#mu eta", dimuonPtBins, " #mu#mu pT (GeV)"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("diFilt%dDimuon_recoEtaPt", int(i + 1)), @@ -274,12 +280,14 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu#mu pT (GeV)", filterNamesLevels[i].first); } + */ myBook2D( ibooker, "diPathDimuon_recoEtaPt", dimuonEtaBins, "#mu#mu eta", dimuonPtBins, " #mu#mu pT (GeV)", triggerPathName); // Eta Phi Single myBook2D(ibooker, "genMuon_genEtaPhi", muonEtaBins, "#mu eta", muonPhiBins, "#mu phi"); myBook2D(ibooker, "globMuon_genEtaPhi", muonEtaBins, "#mu eta", muonPhiBins, "#mu phi"); myBook2D(ibooker, "globMuon_recoEtaPhi", muonEtaBins, "#mu eta", muonPhiBins, "#mu phi"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dMuon_recoEtaPhi", int(i + 1)), @@ -289,12 +297,14 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, "#mu phi", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "pathMuon_recoEtaPhi", muonEtaBins, "#mu eta", muonPhiBins, "#mu phi", triggerPathName); myBook2D(ibooker, "resultMuon_recoEtaPhi", muonEtaBins, "#mu eta", muonPhiBins, "#mu phi"); // Rap Pt Double myBook2D(ibooker, "genDimuon_genRapPt", dimuonEtaBins, "#mu#mu rapidity", dimuonPtBins, " #mu#mu pT (GeV)"); myBook2D(ibooker, "globDimuon_genRapPt", dimuonEtaBins, "#mu#mu rapidity", dimuonPtBins, " #mu#mu pT (GeV)"); myBook2D(ibooker, "globDimuon_recoRapPt", dimuonEtaBins, "#mu#mu rapidity", dimuonPtBins, " #mu#mu pT (GeV)"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dDimuon_recoRapPt", int(i + 1)), @@ -304,6 +314,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu#mu pT (GeV)", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "pathDimuon_recoRapPt", dimuonEtaBins, @@ -312,6 +323,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu#mu pT (GeV)", triggerPathName); myBook2D(ibooker, "resultDimuon_recoRapPt", dimuonEtaBins, "#mu#mu rapidity", dimuonPtBins, " #mu#mu pT (GeV)"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("diFilt%dDimuon_recoRapPt", int(i + 1)), @@ -321,6 +333,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, " #mu#mu pT (GeV)", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "diPathDimuon_recoRapPt", dimuonEtaBins, @@ -332,6 +345,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, myBook2D(ibooker, "genDimuon_genPtDR", dimuonPtBins, " #mu#mu pT (GeV)", dimuonDRBins, "#mu#mu #Delta R at IP"); myBook2D(ibooker, "globDimuon_genPtDR", dimuonPtBins, " #mu#mu pT (GeV)", dimuonDRBins, "#mu#mu #Delta R at IP"); myBook2D(ibooker, "globDimuon_recoPtDR", dimuonPtBins, " #mu#mu pT (GeV)", dimuonDRBins, "#mu#mu #Delta R at IP"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dDimuon_recoPtDR", int(i + 1)), @@ -341,6 +355,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, "#mu#mu #Delta R at IP", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "pathDimuon_recoPtDR", dimuonPtBins, @@ -348,6 +363,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, dimuonDRBins, "#mu#mu #Delta R at IP", triggerPathName); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("diFilt%dDimuon_recoPtDR", int(i + 1)), @@ -357,6 +373,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, "#mu#mu #Delta R at IP", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "diPathDimuon_recoPtDR", dimuonPtBins, @@ -367,6 +384,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, myBook2D(ibooker, "resultDimuon_recoPtDR", dimuonPtBins, " #mu#mu pT (GeV)", dimuonDRBins, "#mu#mu #Delta R at IP"); // Pt DRpos Double myBook2D(ibooker, "globDimuon_recoPtDRpos", dimuonPtBins, " #mu#mu pT (GeV)", dimuonDRBins, "#mu#mu #Delta R in MS"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dDimuon_recoPtDRpos", int(i + 1)), @@ -376,6 +394,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, "#mu#mu #Delta R in MS", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "pathDimuon_recoPtDRpos", dimuonPtBins, @@ -383,6 +402,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, dimuonDRBins, "#mu#mu #Delta R in MS", triggerPathName); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("diFilt%dDimuon_recoPtDRpos", int(i + 1)), @@ -392,6 +412,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, "#mu#mu #Delta R in MS", filterNamesLevels[i].first); } + */ myBook2D(ibooker, "diPathDimuon_recoPtDRpos", dimuonPtBins, @@ -404,6 +425,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, // Matching myBook2D(ibooker, "globGen_deltaEtaDeltaPhi", deltaEtaBins, "#Delta eta", deltaPhiBins, "#Delta phi"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook2D(ibooker, TString::Format("filt%dGlob_deltaEtaDeltaPhi", int(i + 1)), @@ -413,6 +435,7 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, "#Delta phi", filterNamesLevels[i].first); } + */ myBook2D( ibooker, "pathGlob_deltaEtaDeltaPhi", deltaEtaBins, "#Delta eta", deltaPhiBins, "#Delta phi", triggerPathName); // Size of containers @@ -422,10 +445,12 @@ void HeavyFlavorValidation::bookHistograms(DQMStore::IBooker &ibooker, sizeBins.push_back(10); myBook1D(ibooker, "genMuon_size", sizeBins, "container size"); myBook1D(ibooker, "globMuon_size", sizeBins, "container size"); + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { myBook1D( ibooker, TString::Format("filt%dMuon_size", int(i + 1)), sizeBins, "container size", filterNamesLevels[i].first); } + */ myBook1D(ibooker, "pathMuon_size", sizeBins, "container size", triggerPathName); } @@ -510,7 +535,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu } } } - ME[TString::Format("filt%dMuon_size", int(i + 1))]->Fill(muonsAtFilter[i].size()); + //ME[TString::Format("filt%dMuon_size", int(i + 1))]->Fill(muonsAtFilter[i].size()); LogDebug("HLTriggerOfflineHeavyFlavor") << "Filter \"" << filterNamesLevels[i].first << "\" has " << muonsAtFilter[i].size() << " muons" << endl; } @@ -570,6 +595,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu vector glob_gen(genMuons.size(), -1); match(ME["globGen_deltaEtaDeltaPhi"], genMuons, globMuons, genGlobDeltaRMatchingCut, glob_gen); vector > filt_glob; + /* for (size_t i = 0; i < filterNamesLevels.size(); i++) { filt_glob.push_back(vector(globMuons.size(), -1)); if (filterNamesLevels[i].second == 1) { @@ -592,6 +618,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu filt_glob[i]); } } + */ vector path_glob(globMuons.size(), -1); if ((filterNamesLevels.end() - 1)->second == 1) { match(ME["pathGlob_deltaEtaDeltaPhi"], globMuons_position, pathMuons, globL1DeltaRMatchingCut, path_glob); @@ -613,6 +640,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu ME["globMuon_genEtaPhi"]->Fill(genMuons[i].eta(), genMuons[i].phi()); ME["globMuon_recoEtaPt"]->Fill(globMuons[glob_gen[i]].eta(), globMuons[glob_gen[i]].pt()); ME["globMuon_recoEtaPhi"]->Fill(globMuons[glob_gen[i]].eta(), globMuons[glob_gen[i]].phi()); + /* for (size_t f = 0; f < filterNamesLevels.size(); f++) { if (filt_glob[f][glob_gen[i]] != -1) { ME[TString::Format("resFilt%dGlob_recoEtaPt", int(f + 1))]->Fill( @@ -628,6 +656,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu break; } } + */ if (path_glob[glob_gen[i]] != -1) { ME["resPathGlob_recoEtaPt"]->Fill( globMuons[glob_gen[i]].eta(), @@ -686,6 +715,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu if (highPt) ME["globDimuon_recoPtDRpos"]->Fill(globDimuonPt, globDimuonDRpos); //two filter objects + /* for (size_t f = 0; f < filterNamesLevels.size(); f++) { if (filt_glob[f][glob_gen[0]] != -1 && filt_glob[f][glob_gen[secondMuon]] != -1) { ME[TString::Format("diFilt%dDimuon_recoEtaPt", int(f + 1))]->Fill(globDimuonEta, globDimuonPt); @@ -698,7 +728,9 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu break; } } + */ //one filter object + /* for (size_t f = 0; f < filterNamesLevels.size(); f++) { if (filt_glob[f][glob_gen[0]] != -1 || filt_glob[f][glob_gen[secondMuon]] != -1) { ME[TString::Format("filt%dDimuon_recoEtaPt", int(f + 1))]->Fill(globDimuonEta, globDimuonPt); @@ -711,6 +743,7 @@ void HeavyFlavorValidation::analyze(const Event &iEvent, const EventSetup &iSetu break; } } + */ //two path objects if (path_glob[glob_gen[0]] != -1 && path_glob[glob_gen[secondMuon]] != -1) { ME["diPathDimuon_recoEtaPt"]->Fill(globDimuonEta, globDimuonPt);