diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 61b41f12a0f5d4cefea5e4ecc569770fd7d28426..99c5aff73716a96e8f922b1fdac8fd4f7491fcc2 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -3,20 +3,9 @@
from TrigFastTrackFinder.TrigFastTrackFinderConf import TrigFastTrackFinder
from TrigOnlineSpacePointTool.TrigOnlineSpacePointToolConf import TrigL2LayerNumberTool
-from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
-
-from AthenaCommon.AppMgr import ToolSvc
-
-
-
-from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
-
-from AthenaCommon.SystemOfUnits import *
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
class TrigFastTrackFinderMonitoring(GenericMonitoringTool):
def __init__ (self, name, doResMon=False):
self.name = "TrigFastTrackFinder_" + name
@@ -151,402 +140,6 @@ class TrigFastTrackFinderMonitoring(GenericMonitoringTool):
self.defineHistogram('hit_SCTEndcapPull', path='EXPERT',type='TH1F',title="SCT EC hit-track pull",xbins = 100, xmin=-5., xmax=5.)
-#Monitoring
-class TrigFastTrackFinder_CommonMonitoring(TrigGenericMonitoringToolConfig):
- def __init__ (self, name="TrigFastTrackFinder_OnlineMonitoring"):
- super(TrigFastTrackFinder_CommonMonitoring, self).__init__(name)
- def addSPHistograms(self):
- self.Histograms += [ defineHistogram('roi_nSPsPIX',
- type='TH1F',
- title="Number of Pixel SPs",
- xbins = 500, xmin=-0.5, xmax=49999.5)]
- self.Histograms += [ defineHistogram('roi_nSPsSCT',
- type='TH1F',
- title="Number of SCT SPs",
- xbins = 500, xmin=-0.5, xmax=49999.5)]
- self.Histograms += [ defineHistogram('roi_eta',
- type='TH1F',
- title="Eta of the input RoI",
- xbins = 100, xmin=-5, xmax=5)]
- self.Histograms += [ defineHistogram('roi_phi',
- type='TH1F',
- title="Phi of the input RoI",
- xbins = 100, xmin=-3.2, xmax=3.2)]
- self.Histograms += [ defineHistogram('roi_phiWidth',
- type='TH1F',
- title="Phi width of the input RoI",
- xbins = 100, xmin=0, xmax=6.4)]
- self.Histograms += [ defineHistogram('roi_etaWidth',
- type='TH1F',
- title="Eta width of the input RoI",
- xbins = 100, xmin=0, xmax=5)]
- self.Histograms += [ defineHistogram('roi_z',
- type='TH1F',
- title="z of the input RoI",
- xbins = 200, xmin=-400, xmax=400)]
- self.Histograms += [ defineHistogram('roi_zWidth',
- type='TH1F',
- title="z width of the input RoI",
- xbins = 100, xmin=0, xmax=500)]
- def addDataErrorHistograms(self):
- self.Histograms += [ defineHistogram('roi_lastStageExecuted',
- type='TH1F',
- title="Last Step Successfully Executed",
- xbins = 8 , xmin=-0.5, xmax=7.5,
- labels='Start : GetRoI : GetSPs : ZFinder : Triplets : TrackMaker : TrackFitter : TrackConverter' ) ]
-
- def addTrackHistograms(self):
- self.Histograms += [ defineHistogram('trk_nSiHits',
- type='TH1F',
- title="Total number of Silicon Hits per Track",
- xbins = 20, xmin=-0.5, xmax=19.5)]
- self.Histograms += [ defineHistogram('trk_nPIXHits',
- type='TH1F',
- title="Number of Pixel Hits per Track",
- xbins = 10, xmin=-0.5, xmax=9.5)]
- self.Histograms += [ defineHistogram('trk_nSCTHits',
- type='TH1F',
- title="Number of SCT Hits per Track",
- xbins = 10, xmin=-0.5, xmax=9.5)]
- self.Histograms += [ defineHistogram('trk_chi2dof',
- type='TH1F',
- title="ChiSqd / nDoF",
- xbins = 100, xmin=0.0, xmax=5)]
- self.Histograms += [ defineHistogram('trk_pt',
- type='TH1F',
- title="pt",
- xbins = 400, xmin=-1e6, xmax=1e6)]
- self.Histograms += [ defineHistogram('trk_phi0',
- type='TH1F',
- title="phi",
- xbins = 100, xmin=-3.2, xmax=3.2)]
- self.Histograms += [ defineHistogram('trk_eta',
- type='TH1F',
- title="eta",
- xbins = 100, xmin=-5, xmax=5)]
- self.Histograms += [ defineHistogram('trk_dPhi0',
- type='TH1F',
- title="dphi",
- xbins = 160, xmin=-0.8, xmax=0.8)]
- self.Histograms += [ defineHistogram('trk_dEta',
- type='TH1F',
- title="deta",
- xbins = 160, xmin=-0.8, xmax=0.8)]
- self.Histograms += [ defineHistogram('roi_nSeeds',
- type='TH1F',
- title="Number of seeds",
- xbins = 1000, xmin=-0.5, xmax=99999.5)]
- self.Histograms += [ defineHistogram('roi_nZvertices',
- type='TH1F',
- title="Number of z vertices",
- xbins = 60 , xmin=-0.5, xmax=49.5)]
- self.Histograms += [ defineHistogram('roi_zVertices',
- type='TH1F',
- title="ZFinder Vertices",
- xbins = 501, xmin=-250, xmax=250)]
- self.Histograms += [ defineHistogram('roi_nTrk_zVtx',
- type='TH1F',
- title="Ntrk ZFinder Vertices",
- xbins = 100, xmin=-0.5, xmax=49.5)]
-
- #self.Histograms += [ defineHistogram('sp_x , sp_y',
- # type='TH2F',
- # title="Spacepoints-on-track xy",
- # xbins = 200 , xmin=-600.0, xmax=600.0,
- # ybins = 200 , ymin=-600.0, ymax=600.0)]
-
- #self.Histograms += [ defineHistogram('sp_z , sp_r',
- # type='TH2F',
- # title="Spacepoints-on-track rz",
- # xbins = 400 , xmin=-2800.0, xmax=2800.0,
- # ybins = 100 , ymin=0.0, ymax=600.0)]
- #Extra timing histograms for validation only
- def addTimingHistograms(self,nbin,min,max):
- self.Histograms += [ defineHistogram('roi_nSPs , time_PattRecoOnly',
- type='TH2F',
- title="PattReco time vs nSPs",
- xbins = 200 , xmin=0.0, xmax=3000.0,
- ybins = 100 , ymin=0.0, ymax=200.0)]
- self.Histograms += [ defineHistogram('roi_nTracks , time_PattRecoOnly',
- type='TH2F',
- title="PattReco time vs nTracks",
- xbins = 50 , xmin=0.0, xmax=200.0,
- ybins = 100 , ymin=0.0, ymax=200.0)]
- self.Histograms += [ defineHistogram('time_PattRecoOnly',
- type='TH1F',
- title="Pure PattReco time",
- xbins = nbin , xmin=0.0, xmax=200.0)]
- def addResidualHistograms(self):
- self.Histograms += [ defineHistogram('layer_IBL',
- type='TH1F',
- title="IBL layer",
- xbins = 10, xmin=0., xmax=10.)]
- self.Histograms += [ defineHistogram('layer_PixB',
- type='TH1F',
- title="Pixel Barrel layer",
- xbins = 10, xmin=0., xmax=10.)]
- self.Histograms += [ defineHistogram('layer_PixE',
- type='TH1F',
- title="Pixel Endcap layer",
- xbins = 10, xmin=0., xmax=10.)]
- self.Histograms += [ defineHistogram('layer_SCTB',
- type='TH1F',
- title="SCT Barrel layer",
- xbins = 10, xmin=0., xmax=10.)]
- self.Histograms += [ defineHistogram('layer_SCTE',
- type='TH1F',
- title="SCT Endcap layer",
- xbins = 10, xmin=0., xmax=10.)]
- self.Histograms += [ defineHistogram('hit_IBLPhiResidual',
- type='TH1F',
- title="IBL hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_IBLEtaResidual',
- type='TH1F',
- title="IBL hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_IBLPhiPull',
- type='TH1F',
- title="IBL hit-track phi pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_IBLEtaPull',
- type='TH1F',
- title="IBL hit-track eta pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelPhiResidual',
- type='TH1F',
- title="Pixel Barrel hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelEtaResidual',
- type='TH1F',
- title="Pixel Barrel hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelL1PhiResidual',
- type='TH1F',
- title="Pixel Barrel L1 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelL1EtaResidual',
- type='TH1F',
- title="Pixel Barrel L1 hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelL2PhiResidual',
- type='TH1F',
- title="Pixel Barrel L2 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelL2EtaResidual',
- type='TH1F',
- title="Pixel Barrel L2 hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelL3PhiResidual',
- type='TH1F',
- title="Pixel Barrel L3 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelL3EtaResidual',
- type='TH1F',
- title="Pixel Barrel L3 hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelPhiPull',
- type='TH1F',
- title="Pixel Barrel hit-track phi pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_PIXBarrelEtaPull',
- type='TH1F',
- title="Pixel Barrel hit-track eta pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_SCTBarrelResidual',
- type='TH1F',
- title="SCT Barrel hit-track residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTBarrelL1PhiResidual',
- type='TH1F',
- title="SCT Barrel L1 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTBarrelL2PhiResidual',
- type='TH1F',
- title="SCT Barrel L2 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTBarrelL3PhiResidual',
- type='TH1F',
- title="SCT Barrel L3 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTBarrelL4PhiResidual',
- type='TH1F',
- title="SCT Barrel L4 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTBarrelPull',
- type='TH1F',
- title="SCT Barrel hit-track pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapPhiResidual',
- type='TH1F',
- title="Pixel EC hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapEtaResidual',
- type='TH1F',
- title="Pixel EC hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapL1PhiResidual',
- type='TH1F',
- title="Pixel EC L1 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapL1EtaResidual',
- type='TH1F',
- title="Pixel EC L1 hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapL2PhiResidual',
- type='TH1F',
- title="Pixel EC L2 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapL2EtaResidual',
- type='TH1F',
- title="Pixel EC L2 hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapL3PhiResidual',
- type='TH1F',
- title="Pixel EC L3 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapL3EtaResidual',
- type='TH1F',
- title="Pixel EC L3 hit-track eta residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapPhiPull',
- type='TH1F',
- title="Pixel EC hit-track phi pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_PIXEndCapEtaPull',
- type='TH1F',
- title="Pixel EC hit-track eta pull",
- xbins = 100, xmin=-5., xmax=5.)]
- self.Histograms += [ defineHistogram('hit_SCTEndCapResidual',
- type='TH1F',
- title="SCT EC hit-track residual",
- xbins = 100, xmin=-1.0, xmax=1.0)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL1PhiResidual',
- type='TH1F',
- title="SCT Endcap L1 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL2PhiResidual',
- type='TH1F',
- title="SCT Endcap L2 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL3PhiResidual',
- type='TH1F',
- title="SCT Endcap L3 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL4PhiResidual',
- type='TH1F',
- title="SCT Endcap L4 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL5PhiResidual',
- type='TH1F',
- title="SCT Endcap L5 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL6PhiResidual',
- type='TH1F',
- title="SCT Endcap L6 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL7PhiResidual',
- type='TH1F',
- title="SCT Endcap L7 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL8PhiResidual',
- type='TH1F',
- title="SCT Endcap L8 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndcapL9PhiResidual',
- type='TH1F',
- title="SCT Endcap L9 hit-track phi residual",
- xbins = 100, xmin=-0.5, xmax=0.5)]
- self.Histograms += [ defineHistogram('hit_SCTEndCapPull',
- type='TH1F',
- title="SCT EC hit-track pull",
- xbins = 100, xmin=-5., xmax=5.)]
-
-
-
-class TrigFastTrackFinder_OnlineMonitoring(TrigFastTrackFinder_CommonMonitoring):
- def __init__ (self, name="TrigFastTrackFinder_OnlineMonitoring", doResMon=False):
- super(TrigFastTrackFinder_OnlineMonitoring, self).__init__(name)
- self.defineTarget("Online")
- self.addSPHistograms()
- self.addDataErrorHistograms()
- self.addTrackHistograms()
- if doResMon:
- self.addResidualHistograms()
- self.Histograms += [ defineHistogram('trk_a0',
- type='TH1F',
- title="a0",
- xbins = 200, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('trk_a0beam',
- type='TH1F',
- title="a0beam",
- xbins = 200, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('trk_z0',
- type='TH1F',
- title="z0",
- xbins = 200, xmin=-400, xmax=400)]
- self.Histograms += [ defineHistogram('roi_nTracks',
- type='TH1F',
- title="Number of Tracks",
- xbins = 100, xmin=-0.5, xmax=99.5)]
-
-
-
-class TrigFastTrackFinder_ValidationMonitoring(TrigFastTrackFinder_CommonMonitoring):
- def __init__ (self, name="TrigFastTrackFinder_ValidationMonitoring", doResMon=False):
- super(TrigFastTrackFinder_ValidationMonitoring, self).__init__(name)
- self.defineTarget("Validation")
- self.addSPHistograms()
- self.addTimingHistograms(150,0.,150.)
- self.addDataErrorHistograms()
- self.addTrackHistograms()
- if doResMon:
- self.addResidualHistograms()
- self.Histograms += [ defineHistogram('trk_a0',
- type='TH1F',
- title="a0",
- xbins = 200, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('trk_a0beam',
- type='TH1F',
- title="a0beam",
- xbins = 200, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('trk_z0',
- type='TH1F',
- title="z0",
- xbins = 200, xmin=-400, xmax=400)]
- self.Histograms += [ defineHistogram('roi_nTracks',
- type='TH1F',
- title="Number of Tracks",
- xbins = 200, xmin=-0.5, xmax=199.5)]
-
-
-#Cosmic Monitoring
-class TrigFastTrackFinder_Cosmic_Monitoring(TrigFastTrackFinder_CommonMonitoring):
- def __init__ (self, name="TrigFastTrackFinder_Cosmic_Monitoring", doResMon=False):
- super(TrigFastTrackFinder_Cosmic_Monitoring, self).__init__(name)
- self.defineTarget("Cosmic")
- self.addSPHistograms()
- self.addDataErrorHistograms()
- self.addTrackHistograms()
- if doResMon:
- self.addResidualHistograms()
- self.Histograms += [ defineHistogram('trk_a0',
- type='TH1F',
- title="a0",
- xbins = 100, xmin=-300, xmax=300)]
- self.Histograms += [ defineHistogram('trk_a0beam',
- type='TH1F',
- title="a0beam",
- xbins = 100, xmin=-300, xmax=300)]
- self.Histograms += [ defineHistogram('trk_z0',
- type='TH1F',
- title="z0",
- xbins = 100, xmin=-800, xmax=800)]
- self.Histograms += [ defineHistogram('roi_nTracks',
- type='TH1F',
- title="Number of Tracks",
- xbins = 100, xmin=-0.5, xmax=99.5)]
-
remap = {
"Muon" : "muon",
"MuonFS" : "muon",
@@ -574,7 +167,7 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
def __init__(self, name, type):
TrigFastTrackFinder.__init__(self,name)
remapped_type = remap[type]
- assert(remapped_type!=None)
+ assert(remapped_type is not None)
self.retrieveBarCodes = False#Look at truth information for spacepoints from barcodes
#self.SignalBarCodes = [10001] #single particles
@@ -590,18 +183,11 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
ToolSvc += numberingTool
self.LayerNumberTool = numberingTool
- timeHist = TrigTimeHistToolConfig("Time")
- timeHist.TimerHistLimits = [0,10000]
from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
self.doResMon = InDetTrigSliceSettings[('doResMon',remapped_type)]
# switch between Run-2/3 monitoring
- if TriggerFlags.doMT():
- self.MonTool = TrigFastTrackFinderMonitoring(type, self.doResMon)
- else:
- self.AthenaMonTools = [ TrigFastTrackFinder_ValidationMonitoring("TrigFastTrackFinder_ValidationMonitoring", self.doResMon),
- TrigFastTrackFinder_OnlineMonitoring("TrigFastTrackFinder_OnlineMonitoring", self.doResMon),
- timeHist ]
+ self.MonTool = TrigFastTrackFinderMonitoring(type, self.doResMon)
from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
self.TrackSummaryTool = InDetTrigFastTrackSummaryTool