diff --git a/Calorimeter/CaloRec/python/CaloCellGetter.py b/Calorimeter/CaloRec/python/CaloCellGetter.py index 95b8fe0fa37b18c1ba7df015b6989e39a311cac2..2d1a0a959138eb62b6926652a04e356b21624c9d 100644 --- a/Calorimeter/CaloRec/python/CaloCellGetter.py +++ b/Calorimeter/CaloRec/python/CaloCellGetter.py @@ -341,7 +341,7 @@ class CaloCellGetter (Configured) : return False theLArSporadicNoiseMasker.DoMasking = True theLArSporadicNoiseMasker.ProblemsToMask = ["sporadicBurstNoise"] - ToolSvc += theLArSporadicNoiseMasker + #ToolSvc += theLArSporadicNoiseMasker theLArCellNoiseMaskingTool.MaskingSporadicTool = theLArSporadicNoiseMasker if doNoiseMask: @@ -354,7 +354,7 @@ class CaloCellGetter (Configured) : return False theLArNoiseMasker.DoMasking=True theLArNoiseMasker.ProblemsToMask= ["highNoiseHG","highNoiseMG","highNoiseLG","deadReadout","deadPhys"] - ToolSvc+=theLArNoiseMasker + #ToolSvc+=theLArNoiseMasker theLArCellNoiseMaskingTool.MaskingTool = theLArNoiseMasker theLArCellNoiseMaskingTool.maskNoise = doNoiseMask diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py index adcd3dcc4cd46800e08287b54b43839ff7a51eba..5b2098633307adb3d39b3859b98079fcd6576010 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py @@ -14,7 +14,7 @@ if DetFlags.readRDOBS.pixel_on(): from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProviderTool InDetPixelRawDataProviderTool = PixelRawDataProviderTool(name = "InDetPixelRawDataProviderTool", Decoder = InDetPixelRodDecoder) - ToolSvc += InDetPixelRawDataProviderTool + #ToolSvc += InDetPixelRawDataProviderTool if (InDetFlags.doPrintConfigurables()): print InDetPixelRawDataProviderTool #InDetPixelRawDataProviderTool.OutputLevel = VERBOSE @@ -76,7 +76,7 @@ if DetFlags.readRDOBS.TRT_on(): from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProviderTool InDetTRTRawDataProviderTool = TRTRawDataProviderTool(name = "InDetTRTRawDataProviderTool", Decoder = InDetTRTRodDecoder) - ToolSvc += InDetTRTRawDataProviderTool + #ToolSvc += InDetTRTRawDataProviderTool if (InDetFlags.doPrintConfigurables()): print InDetTRTRawDataProviderTool #InDetTRTRawDataProviderTool.OutputLevel = VERBOSE diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py index c4884ae3851e38db4c7985f973b8f8639f435ca9..76a86c0f63028dbde3ae71df2919838b05c60d93 100644 --- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py +++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py @@ -607,7 +607,7 @@ def setupTauJVFTool(): """ from JetRecTools.JetRecToolsConf import JetTrackSelectionTool - ToolSvc += JetTrackSelectionTool(InputContainer = _DefaultTrackContainer, + jetTrackAlg.Tools += JetTrackSelectionTool(InputContainer = _DefaultTrackContainer, OutputContainer="JetSelectedTracks_forTaus", Selector=InDetTrackSelectorToolForTJVA, OutputLevel=2 @@ -616,17 +616,15 @@ def setupTauJVFTool(): """ from JetRecTools.JetRecToolsConf import TrackVertexAssociationTool - ToolSvc += TrackVertexAssociationTool(TrackParticleContainer = _DefaultTrackContainer , - TrackVertexAssociation="JetTrackVtxAssoc_forTaus", - VertexContainer= _DefaultVertexContainer, - MaxTransverseDistance = 2.5 *mm, - #MaxLongitudinalDistance = 2 *mm, - MaxZ0SinTheta = 3.0 *mm, - #OutputLevel=2 - ) - #jetTrackAlg.Tools = [ToolSvc.JetTrackSelectionTool , ToolSvc.TrackVertexAssociationTool ] - jetTrackAlg.Tools = [ ToolSvc.TrackVertexAssociationTool ] - + jetTrackAlg.Tools += TrackVertexAssociationTool(TrackParticleContainer = _DefaultTrackContainer , + TrackVertexAssociation="JetTrackVtxAssoc_forTaus", + VertexContainer= _DefaultVertexContainer, + MaxTransverseDistance = 2.5 *mm, + #MaxLongitudinalDistance = 2 *mm, + MaxZ0SinTheta = 3.0 *mm, + #OutputLevel=2 + ) + from AthenaCommon.AlgSequence import AlgSequence topSequence = AlgSequence() topSequence+=jetTrackAlg diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py index 05f9ae4d924b332fafb83d89fa5db26b7872ce77..8839bbeb98b403f823552ced7a8e4ad06295d781 100644 --- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py +++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py @@ -121,7 +121,7 @@ class TileRawChannelGetter ( Configured) : if globalflags.DataSource() == 'data': # check if there are DSP thresholds in DB - if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits() and not tileInfoConfigurator.setupCOOLDspThreshold(): + if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits(): jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits = False if jobproperties.TileRecFlags.correctPedestalDifference(): @@ -129,8 +129,8 @@ class TileRawChannelGetter ( Configured) : toolOfcCoolOF1 = getTileCondToolOfcCool('COOL', TilePulse, 'OF1', 'TileCondToolOfcCoolOF1') if athenaCommonFlags.isOnline() or not toolOfcCoolOF1: jobproperties.TileRecFlags.correctPedestalDifference = False - else: - tileInfoConfigurator.setupCOOLTIME(online = True) + #else: + # tileInfoConfigurator.setupCOOLTIME(online = True) if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits() or jobproperties.TileRecFlags.correctPedestalDifference(): from TileRecUtils.TileRecUtilsConf import TileRawChannelOF1Corrector