diff --git a/Calorimeter/CaloRec/python/CaloCellGetter.py b/Calorimeter/CaloRec/python/CaloCellGetter.py index 94834b869d3d855359b6e06b53c3038bbb8a9dc9..404cbda7943feaf7e554d56b0b266c5e10371e7b 100644 --- a/Calorimeter/CaloRec/python/CaloCellGetter.py +++ b/Calorimeter/CaloRec/python/CaloCellGetter.py @@ -194,10 +194,6 @@ class CaloCellGetter (Configured) : from TileRecUtils.TileRecFlags import jobproperties theTileCellBuilder.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer() - if not hasattr( ToolSvc, "TileBeamInfoProvider" ): - from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider - ToolSvc += TileBeamInfoProvider() - rawChannelContainer = '' if globalflags.DataSource() == 'data' and globalflags.InputFormat() == 'bytestream': if jobproperties.TileRecFlags.readDigits(): @@ -205,7 +201,6 @@ class CaloCellGetter (Configured) : theTileCellBuilder.correctTime = False; theTileCellBuilder.correctAmplitude = False; else: - ToolSvc.TileBeamInfoProvider.TileRawChannelContainer = "TileRawChannelCnt" rawChannelContainer = 'TileRawChannelCnt' # by default parameters are tuned for opt.filter without iterations theTileCellBuilder.correctTime = jobproperties.TileRecFlags.correctTime() diff --git a/Calorimeter/CaloRec/python/CaloCellGetter_DigiHSTruth.py b/Calorimeter/CaloRec/python/CaloCellGetter_DigiHSTruth.py index 4a5b59694f7ba9eb0137368c0d2ff5d1a1d3da32..b3a05cd8b67e77c0095c5f9bd2aebe84fc0199fc 100755 --- a/Calorimeter/CaloRec/python/CaloCellGetter_DigiHSTruth.py +++ b/Calorimeter/CaloRec/python/CaloCellGetter_DigiHSTruth.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration # specifies Calo cell making # so far only handle the RawChannel->CaloCell step @@ -85,10 +85,6 @@ class CaloCellGetter_DigiHSTruth (Configured) : theTileCellBuilder.MBTSContainer = "MBTSContainer2_DigiHSTruth" theTileCellBuilder.TileDSPRawChannelContainer = "TileRawChannelCnt_DigiHSTruth" - if not hasattr( ToolSvc, "TileBeamInfoProvider" ): - from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider - ToolSvc += TileBeamInfoProvider() - theCaloCellMaker += theTileCellBuilder theCaloCellMaker.CaloCellMakerToolNames += [theTileCellBuilder] except: @@ -427,6 +423,9 @@ class CaloCellGetter_DigiHSTruth (Configured) : + from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault + TileDQstatusAlgDefault() + # now add algorithm to topSequence # this should always come at the end diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py index 9cd1b5e5a48ed314978f25f32d6638a357b3315f..97e33f023c832fe27724f8ed61751104f322a573 100644 --- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py +++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py @@ -1233,9 +1233,6 @@ if doTileMon: else: runType = TileRunType - from TileRecUtils.TileBeamInfoProviderDefault import TileBeamInfoProviderDefault - TileBeamInfoProviderDefault() - from AthenaMonitoring.AthenaMonitoringConf import * TileMon = AthenaMonManager( "TileMon" ) diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py index 620d705a0970ed6cf4b10fda257a63c4444b4a18..991aeb5e1bc29c72090b743d85e0c41b3dd380fd 100644 --- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py +++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py @@ -350,14 +350,6 @@ topSequence += theTileTBStat theTileTBStat.TileDigitsContainer = "TileDigitsCnt" theTileTBStat.TileBeamElemContainer = "TileBeamElemCnt" -from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider -theTileBeamInfoProvider = TileBeamInfoProvider() -theTileBeamInfoProvider.TileBeamElemContainer="TileBeamElemCnt"; -theTileBeamInfoProvider.TileDigitsContainer="TileDigitsCnt"; -theTileBeamInfoProvider.TileRawChannelContainer="TileRawChannelCnt"; -from AthenaCommon.AppMgr import ToolSvc -ToolSvc += theTileBeamInfoProvider - if OutputLevel < 2: from TileByteStream.TileByteStreamConf import TileROD_Decoder ToolSvc += TileROD_Decoder() diff --git a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py index 12106a938c02f10bf57fa3b5336f703e5fb22ac7..92381b16979b266dae91f2211ed953102171c068 100644 --- a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py +++ b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py @@ -198,17 +198,6 @@ if doTileDigitToRawChannel: from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault dqstatus = TileDQstatusAlgDefault() -if not hasattr( ToolSvc, "TileBeamInfoProvider" ): - from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider - theTileBeamInfoProvider = TileBeamInfoProvider() - ToolSvc += theTileBeamInfoProvider - -# change default parameters for TileBeamInfo -ToolSvc.TileBeamInfoProvider.TileBeamElemContainer=""; # disable reading of trigger type from BeamElem container -ToolSvc.TileBeamInfoProvider.TileDigitsContainer=""; # disable checking of Digits container size for bi-gain mode -ToolSvc.TileBeamInfoProvider.TileRawChannelContainer=""; # disable checking of DQstatus for simulated data - - # include( "TileSimAlgs/TileSamplingFraction_jobOptions.py" ) diff --git a/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py index b2c227b56a3312990263454a1088688fa14359fc..e482a3694fcd210ab8e9f90b42d1ea2f117e649a 100644 --- a/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py +++ b/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py @@ -112,16 +112,6 @@ if doTileDigitToRawChannel: ToolSvc.TileRawChannelBuilderFitFilter.SaturatedSampleError = 6; # error (in terms of RMS) assigned to sat.sample -if not hasattr( ToolSvc, "TileBeamInfoProvider" ): - from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider - theTileBeamInfoProvider = TileBeamInfoProvider() - ToolSvc += theTileBeamInfoProvider - -# change default parameters for TileBeamInfo -ToolSvc.TileBeamInfoProvider.TileBeamElemContainer=""; # disable reading of trigger type from BeamElem container -ToolSvc.TileBeamInfoProvider.TileDigitsContainer=""; # disable checking of Digits container size for bi-gain mode -ToolSvc.TileBeamInfoProvider.TileRawChannelContainer=""; # disable checking of DQstatus for simulated data - from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault dqstatus = TileDQstatusAlgDefault() diff --git a/TileCalorimeter/TileSimAlgs/share/TileTBDigitization_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileTBDigitization_jobOptions.py index b32230dee28fe9add4145676a30c19eff9d926a0..c18685b4a3ea2f30c79e11d0943142e8df62be60 100644 --- a/TileCalorimeter/TileSimAlgs/share/TileTBDigitization_jobOptions.py +++ b/TileCalorimeter/TileSimAlgs/share/TileTBDigitization_jobOptions.py @@ -118,16 +118,6 @@ if doTileTBHitToBeamElem: theTileBeamElemGetter = TileBeamElemGetter() -if not hasattr( ToolSvc, "TileBeamInfoProvider" ): - from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider - theTileBeamInfoProvider = TileBeamInfoProvider() - ToolSvc += theTileBeamInfoProvider - -# change default parameters for TileBeamInfo -ToolSvc.TileBeamInfoProvider.TileBeamElemContainer=""; # disable reading of trigger type from BeamElem container -ToolSvc.TileBeamInfoProvider.TileDigitsContainer=""; # disable checking of Digits container size for bi-gain mode -ToolSvc.TileBeamInfoProvider.TileRawChannelContainer=""; # disable checking of DQstatus for simulated data - from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault dqstatus = TileDQstatusAlgDefault() diff --git a/TileCalorimeter/TileTBRec/share/jobOptions_TileOldTB.py b/TileCalorimeter/TileTBRec/share/jobOptions_TileOldTB.py index be5dee9cba2bfb3d56f9ddbbf1fb8f21bededc2c..3f17e6bbb9ae123f6ffc2aaaaeec153fb6de6213 100644 --- a/TileCalorimeter/TileTBRec/share/jobOptions_TileOldTB.py +++ b/TileCalorimeter/TileTBRec/share/jobOptions_TileOldTB.py @@ -167,7 +167,6 @@ doTileFit = True include( "TileTBRec/TileTBDefaults_jobOptions.py" ) include( "TileSimAlgs/TileTBDigitization_jobOptions.py" ) include( "TileTBRec/TileTBRec_jobOptions.py" ) -ToolSvc.TileBeamInfoProvider.OutputLevel = OutputLevel theTileTBOldNtupleWrite=TileTBOldNtupleWrite() diff --git a/Trigger/TriggerRelease/share/jobOfragment_ReadBS_standalone.py b/Trigger/TriggerRelease/share/jobOfragment_ReadBS_standalone.py index 0fedef4832a2fd67dc597821f7cb42ecc3ff0446..d4b33806e746d9c86ae91691c72d83012ea6e588 100644 --- a/Trigger/TriggerRelease/share/jobOfragment_ReadBS_standalone.py +++ b/Trigger/TriggerRelease/share/jobOfragment_ReadBS_standalone.py @@ -4,13 +4,6 @@ if TriggerFlags.doCalo(): from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault dqstatus = TileDQstatusAlgDefault() - from TileRecUtils.TileRecUtilsConf import TileBeamInfoProvider - theTileBeamInfoProvider = TileBeamInfoProvider() - ToolSvc += theTileBeamInfoProvider - if not globalflags.DataSource=='data': - theTileBeamInfoProvider.TileBeamElemContainer=""; # disable reading of trigger type from BeamElem container - theTileBeamInfoProvider.TileDigitsContainer=""; # disable checking of Digits container size for bi-gain mode - # This is only needed in case we do the (obsolete) per-event muon data preparation (bug #84525) if TriggerFlags.doMuon() and TriggerFlags.doEF() and 'forceMuonDataPrep' in dir():