diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinderMT_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinderMT_Config.py index b3cc2d6a811403dd914218189f0e0371d4f6d716..c56fd908024e11c16b16afe0512aadab0b43762f 100644 --- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinderMT_Config.py +++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinderMT_Config.py @@ -63,17 +63,6 @@ class TrigFastTrackFinderMTBase(TrigFastTrackFinderMT): self.Doublet_FilterRZ = False - ## SCT and Pixel detector elements road builder - from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSiDetElementsRoadMaker - InDetTrigSiDetElementsRoadMaker_FTF = InDetTrigSiDetElementsRoadMaker.clone('InDetTrigSiDetElementsRoadMaker_FTF') - InDetTrigSiDetElementsRoadMaker_FTF.RoadWidth = 10.0 - InDetTrigSiDetElementsRoadMaker_FTF.usePixel = True - InDetTrigSiDetElementsRoadMaker_FTF.useSCT = True - if remapped_type=="cosmics": - from InDetTrigRecExample.InDetTrigConfigRecLoadToolsCosmics import InDetTrigSiDetElementsRoadMakerCosmics - InDetTrigSiDetElementsRoadMaker_FTF = InDetTrigSiDetElementsRoadMakerCosmics.clone('InDetTrigSiDetElementsRoadMaker_FTF') - ToolSvc += InDetTrigSiDetElementsRoadMaker_FTF - from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import EFIDTrackingCuts TrackingCuts = EFIDTrackingCuts if remapped_type=="cosmics": @@ -102,7 +91,6 @@ class TrigFastTrackFinderMTBase(TrigFastTrackFinderMT): ToolSvc += PixelClusterOnTrackToolDigital from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__SCT_ClusterOnTrackTool SCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool ("InDetSCT_ClusterOnTrackTool", - #CorrectionStrategy = -1, # no position correction (test for bug #56477) CorrectionStrategy = 0, # do correct position bias ErrorStrategy = 2) # do use phi dependent errors ToolSvc += SCT_ClusterOnTrackTool @@ -180,8 +168,7 @@ class TrigFastTrackFinderMTBase(TrigFastTrackFinderMT): - from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigRotCreator - theTrigInDetTrackFitter.ROTcreator = InDetTrigRotCreator + theTrigInDetTrackFitter.ROTcreator = InDetRotCreatorDigital ToolSvc += theTrigInDetTrackFitter self.trigInDetTrackFitter = theTrigInDetTrackFitter from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags @@ -216,6 +203,7 @@ class TrigFastTrackFinderMTBase(TrigFastTrackFinderMT): ToolSvc += resCalc self.TrigL2ResidualCalculator = resCalc self.doCloneRemoval = InDetTrigSliceSettings[('doCloneRemoval',remapped_type)] + print self class TrigFastTrackFinderMT_eGamma(TrigFastTrackFinderMTBase): def __init__(self, name = "TrigFastTrackFinderMT_eGamma"): diff --git a/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py b/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py index c9f48c468332ee4b9f7452983c85890da9a44a19..e619151d1c8757b61df6608803d47ca27df90cb8 100644 --- a/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py +++ b/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py @@ -8,6 +8,12 @@ globalflags.Luminosity.set_Value_and_Lock('zero') globalflags.DataSource.set_Value_and_Lock('data') globalflags.InputFormat.set_Value_and_Lock('bytestream') globalflags.DatabaseInstance.set_Value_and_Lock('CONDBR2') + + +from AthenaCommon.AlgScheduler import AlgScheduler +AlgScheduler.OutputLevel( INFO ) +AlgScheduler.ShowControlFlow( True ) +AlgScheduler.ShowDataDependencies( True ) from AthenaCommon.JobProperties import jobproperties jobproperties.Global.DetDescrVersion = "ATLAS-R2-2015-03-01-00" @@ -85,7 +91,6 @@ ServiceMgr += ROBDataProviderSvc() #Run calo decoder from L1Decoder.L1DecoderConf import L1CaloDecoder caloDecoder = L1CaloDecoder() # by default it is steered towards the RoIBResult of the name above -caloDecoder.OutputLevel=VERBOSE topSequence += caloDecoder from InDetRecExample.InDetJobProperties import InDetFlags @@ -285,4 +290,3 @@ theFTFMT.outputLevel=VERBOSE #topSequence += theFTFMT -