Merge branch 'noisetool.TileMonitoring-20210329' into 'master'

TileMonitoring+TileRecEx: Remove references to CaloNoiseTool.

See merge request atlas/athena!42112

TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py

@@ -1766,9 +1766,6 @@ if not 'db' in dir():
     svcMgr += DBReplicaSvc(UseCOOLSQLite=False)
 
 
-if hasattr (svcMgr.ToolSvc, 'CaloNoiseToolDefault'):
-    ToolSvc.CaloNoiseToolDefault.RescaleForHV = False
-
 # Needed during maintanance campaign
 # if doTileMon and doTileMonDigi: ToolSvc.TileDigitsMon.FillPedestalDifference = False
 

TileCalorimeter/TileMonitoring/share/TileMonTopoCluster_jobOptions.py

@@ -32,7 +32,6 @@ from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
 CaloNoiseCondAlg()
 
 from AthenaCommon.AppMgr import ToolSvc
-#ToolSvc += theCaloNoiseTool
 
 doTopoClusterLocalCalib=False
 
@@ -129,7 +128,6 @@ TileTopoMaker.ClusterEtorAbsEtCut            = 0.0*MeV
 #Double gaussian noise
 #TileTopoMaker.TwoGaussianNoise = True
 #TileTopoMaker.OutputLevel=1
-#theCaloNoiseTool.OutputLevel=1
 TileTopoMaker.TwoGaussianNoise = jobproperties.CaloTopoClusterFlags.doTwoGaussianNoise()
 
 

TileCalorimeter/TileMonitoring/share/TileRec_topOptions.py

 #
-#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 #
 
 #*****************************************************************
@@ -455,6 +455,4 @@ if TileUseCOOL:
 #if hasattr (svcMgr.ToolSvc, 'TileCellBuilder'):
 #    ToolSvc.TileCellBuilder.OutputLevel = DEBUG
 
-if hasattr (svcMgr.ToolSvc, 'CaloNoiseToolDefault'):
-    ToolSvc.CaloNoiseToolDefault.RescaleForHV = False