Skip to content
Snippets Groups Projects
Commit ba91bb5b authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'idtrigm' into 'master' 

Add the precision tracking collections to the tier0 and PhysVal monitoring

See merge request atlas/athena!32151
parents e52f2699 86528ad3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
+ 32
− 15
View file @ ba91bb5b
......@@ -84,7 +84,9 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
if mt_chains:
chainnames = [
"HLT_e.*idperf.*:key=HLT_IDTrack_Electron_FTF",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_FTF"
"HLT_e.*idperf.*:key=HLT_IDTrack_Electron_IDTrig",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_FTF",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_IDTrig"
]
else:
chainnames = [
......@@ -101,7 +103,9 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
if mt_chains:
chainnames = [
"HLT_e.*idperf.*:key=HLT_IDTrack_Electron_FTF",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_FTF"
"HLT_e.*idperf.*:key=HLT_IDTrack_Electron_IDTrig",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_FTF",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_IDTrig"
]
else:
chainnames = [
......@@ -118,8 +122,8 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
useHighestPT = True
if mt_chains:
chainnames = [
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF",
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF:roi=HLT_Roi_L2SAMuon"
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF:roi=HLT_Roi_L2SAMuon",
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_IDTrig:roi=HLT_Roi_L2SAMuon"
]
else:
chainnames = [
......@@ -137,7 +141,8 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
useOffline=True
if mt_chains:
chainnames = [
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF"
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF:roi=HLT_Roi_L2SAMuon",
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_IDTrig:roi=HLT_Roi_L2SAMuon"
]
else:
chainnames = [
......@@ -155,6 +160,7 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
chainnames = [
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_TauCore_FTF",
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_TauIso_FTF",
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_Tau_IDTrig",
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_Tau_FTF"
]
else:
......@@ -177,6 +183,7 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
chainnames = [
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_TauCore_FTF",
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_TauIso_FTF",
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_Tau_IDTrig",
"HLT_tau.*idperf.*tracktwo.*:key=HLT_IDTrack_Tau_FTF"
]
else:
......@@ -188,11 +195,19 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
]
outputlist += [makePhysvalMon(name, pdgid, chainnames, useHighestPT, cosmic, useOffline )]
if not mt_chains:
############### Bjets ###############
name = "Bjet"
pdgid = 5
useHighestPT = False
############### Bjets ###############
name = "Bjet_offline"
pdgid = 5
useHighestPT = False
cosmic=False
useOffline=True
if mt_chains:
chainnames = [
":key=HLT_IDTrack_FS_FTF",
"HLT_j.*b.*perf_split:key=HLT_IDTrack_Bjet_FTF",
"HLT_j.*b.*perf_split:key=HLT_IDTrack_Bjet_IDTrig"
]
else:
chainnames = [
"HLT_j.*b.*perf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=TrigSuperRoi",
"HLT_j.*b.*perf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
......@@ -201,14 +216,16 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
"HLT_mu.*b.*perf_dr05:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
"HLT_mu.*b.*perf_dr05:InDetTrigTrackingxAODCnv_Bjet_FTF"
]
outputlist += [makePhysvalMon(name, pdgid, chainnames, useHighestPT )]
outputlist += [makePhysvalMon(name, pdgid, chainnames, useHighestPT, cosmic, useOffline )]
if not mt_chains:
############### Bjets ###############
name = "Bjet_offline"
name = "Bjet"
pdgid = 5
useHighestPT = False
cosmic=False
useOffline=True
chainnames = [
"HLT_j.*b.*perf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=TrigSuperRoi",
"HLT_j.*b.*perf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
......@@ -217,7 +234,7 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
"HLT_mu.*b.*perf_dr05:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
"HLT_mu.*b.*perf_dr05:InDetTrigTrackingxAODCnv_Bjet_FTF"
]
outputlist += [makePhysvalMon(name, pdgid, chainnames, useHighestPT, cosmic, useOffline )]
outputlist += [makePhysvalMon(name, pdgid, chainnames, useHighestPT )]
############### Bphys ###############
name = "Bphys"
......
Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
+ 33
− 13
View file @ ba91bb5b
......@@ -81,6 +81,7 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
tidaegamma.ntupleChainNames += [
"Offline",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_FTF",
"HLT_e.*etcut.*:key=HLT_IDTrack_Electron_IDTrig",
"HLT_e.*_gsf_idperf.*:key=GSFTrigTrackParticles"
]
else:
......@@ -168,8 +169,11 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
if mt_chains:
tidamuon.ntupleChainNames += [
"Offline",
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF",
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF:roi=HLT_Roi_L2SAMuon"
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_FTF:roi=HLT_Roi_L2SAMuon",
"HLT_mu.*idperf.*:key=HLT_IDTrack_Muon_IDTrig:roi=HLT_Roi_L2SAMuon",
"HLT_mu.*idperf.*:key=HLT_IDTrack_MuonIso_FTF",
"HLT_mu.*idperf.*:key=HLT_IDTrack_MuonIso_IDTrig",
"HLT_mu.*idperf.*:key=HLT_IDTrack_MuonLate_IDTrig"
]
else:
tidamuon.ntupleChainNames += [
......@@ -247,6 +251,7 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
"HLT_tau.*idperf.*:key=HLT_IDTrack_TauCore_FTF:roi=HLT_TAURoI",
"HLT_tau.*idperf.*:key=HLT_IDTrack_TauIso_FTF:roi=HLT_TAURoI",
"HLT_tau.*idperf.*:key=HLT_IDTrack_Tau_FTF:roi=HLT_TAURoI"
"HLT_tau.*idperf.*:key=HLT_IDTrack_Tau_IDTrig:roi=HLT_TAURoI"
]
else:
tidatau.ntupleChainNames += [
......@@ -262,6 +267,7 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
if not mt_chains:
# Shifter instances
tidataushift = TrigTestBase(name = "IDTauShifterTool",
......@@ -302,16 +308,28 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
list += [ tidataupurity ]
##############################################################
# Bjet instances - check track collection names
##############################################################
##############################################################
# Bjet instances - check track collection names
##############################################################
# Expert instances
tidabjet = TrigTestBase(name = "IDBjetTool",
histoPathBase = "/Trigger/HLT")
tidabjet.AnalysisConfig = "Tier0"
tidabjet.SliceTag = "HLT/TRIDT/Bjet/Expert"
# Expert instances
tidabjet = TrigTestBase(name = "IDBjetTool",
histoPathBase = "/Trigger/HLT")
tidabjet.AnalysisConfig = "Tier0"
tidabjet.SliceTag = "HLT/TRIDT/Bjet/Expert"
if mt_chains:
tidabjet.ntupleChainNames += [
"Offline",
":key=HLT_IDTrack_FS_FTF",
"HLT_j.*.*boffperf.*:key=HLT_IDTrack_Bjet_FTF",
"HLT_j.*.*boffperf.*:key=HLT_IDTrack_Bjet_IDTrig"
]
else:
tidabjet.ntupleChainNames += [
"Offline",
# jet based chains
......@@ -324,10 +342,12 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_FTF",
"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_IDTrig"
]
list += [ tidabjet ]
list += [ tidabjet ]
if not mt_chains:
# Shifter instances
tidabjetshift = TrigTestBase(name = "IDBjetShifterTool",
histoPathBase = "/Trigger/HLT")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment