diff --git a/Calorimeter/CaloRec/ispellwords b/Calorimeter/CaloRec/ispellwords
index 223a70c04efaa7c31e264c440998ea6d599a4cd8..39b1f89f0f0004088391a4e9a0a74fee395a2ed4 100644
--- a/Calorimeter/CaloRec/ispellwords
+++ b/Calorimeter/CaloRec/ispellwords
@@ -654,7 +654,6 @@ TileCalibrationCellHitCnt
TileCalibHitActiveCell
TileCalibHitInactiveCell
TileCalibHitDeadMaterial
-CellDetailsNoiseTool
DetStore
AuditInitialize
doLArHitToCellDirect
@@ -908,12 +907,10 @@ const
CPUTimeRef
LArClusterCopier
larClusterCopier
-CaloNoiseTool
TopoClusterMapperGetter
SRT
sizep
stl
-useNoiseTool
AuditBeginRun
theCaloCellContainerCheckerTool
EMCellContainerName
@@ -952,7 +949,6 @@ AuditFinalize
CopyCell
leakRSS
gapscin
-UseCaloNoiseTool
MeVTool
PreSampE
TWOPI
@@ -1018,7 +1014,6 @@ jetrec
makeinfo
jobProperty
CaloTopoSplitterClusterCell
-theCaloNoiseTool
laplace
ThresholdGeVCells
thresholdGeVCells
@@ -1036,7 +1031,6 @@ EvtMax
CaloTopoSplitterHashCluster
CaloClusterStoreHelper
DMCalib
-LArNoiseTool
MinBias
AuditRestart
maxima
@@ -1048,7 +1042,6 @@ CellContainers
maxEt
LArCmbTwrBldr
CaloTowerCmbGetter
-ICalorimeterNoiseTool
LArCmbTwrBldrChronobuild
ClusterContainer
memexe
@@ -1087,7 +1080,6 @@ AthenaKernel
CaloCellsName
MyPackage
TileCells
-CaloNoiseToolDefault
lastEvForLeak
LArRawChannels
efcal
@@ -1232,7 +1224,6 @@ ntileb
enums
CellCorrections
MonitorService
-ICaloNoiseTool
iCalo
EMTopo
ntileg
@@ -1259,7 +1250,6 @@ eng
Unal
enum
endif
-noiseTool
MinLLongitudinal
endcap
EndCap
diff --git a/Calorimeter/CaloRec/python/CaloTopoTowerGetter.py b/Calorimeter/CaloRec/python/CaloTopoTowerGetter.py
index ee7f5938d5b1d61cd9a44573b9312e05d1c70f48..98d48dbf1e79d4007fcc676833609ac664c3d5e8 100644
--- a/Calorimeter/CaloRec/python/CaloTopoTowerGetter.py
+++ b/Calorimeter/CaloRec/python/CaloTopoTowerGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# specifies Tower/TopoCluster -> TopoTower
from AthenaCommon.JobProperties import jobproperties as jp
@@ -111,8 +111,6 @@ class CaloTopoTowerGetter ( Configured ) :
theCaloTopoTowerAlgorithm.MinimumClusterEnergy = -1000000000.0
theCaloTopoTowerAlgorithm.CellEnergySignificance = -1.
- # noise tool
- theCaloTopoTowerAlgorithm.UseCaloNoiseTool = False
########################
diff --git a/Calorimeter/CaloRec/python/MakeTowersFromClusters.py b/Calorimeter/CaloRec/python/MakeTowersFromClusters.py
index 3e804300391c80fbb05b4dcac529e02b53aba5bf..4e312a59e41b4b764df4e8c97b0920c770199832 100644
--- a/Calorimeter/CaloRec/python/MakeTowersFromClusters.py
+++ b/Calorimeter/CaloRec/python/MakeTowersFromClusters.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -132,11 +132,6 @@ def MakeTowersFromClusters(towerMakerName = 'CaloTowerBuilderAlg', #
''' External tools for moment calculation
'''
- ##from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
- #from AthenaCommon.AppMgr import ToolSvc
- #caloNoiseTool = CaloNoiseToolDefault()
- #ToolSvc += caloNoiseTool
-
from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
CaloNoiseCondAlg ()
CaloNoiseCondAlg(noisetype="totalNoise") # "electronicNoise","pileupNoise","totalNoise"
@@ -148,8 +143,6 @@ def MakeTowersFromClusters(towerMakerName = 'CaloTowerBuilderAlg', #
from CaloRec.CaloRecConf import CaloClusterMomentsMaker
clusterMoments = CaloClusterMomentsMaker (towerMakerName+'MomentMaker')
clusterMoments.MaxAxisAngle = 20*deg
- #clusterMoments.CaloNoiseTool = caloNoiseTool
- #clusterMoments.UsePileUpNoise = True
clusterMoments.TwoGaussianNoise = jobproperties.CaloTopoClusterFlags.doTwoGaussianNoise()
clusterMoments.MinBadLArQuality = 4000
clusterMoments.MomentsNames = [
diff --git a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
index 67fdb6ffa555cd0e30b68fa8023b23db53ba602c..6215b638bbe8e584c7060865fa66fef8deb6136e 100644
--- a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
+++ b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
@@ -90,13 +90,9 @@ if rec.readESD and not rec.doESD:
## if rec.readESD() and DetFlags.detdescr.Calo_on():
## from CaloRec.CaloRecConf import CaloCellMaker
## theCaloCellMaker=CaloCellMaker(CaloCellsOutputName="AllCalo",CaloCellHack=True)
-## # calo modifying tool to be inserted there
-## from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
-## theCaloNoiseTool = CaloNoiseToolDefault()
-## ToolSvc+=theCaloNoiseTool
## from CaloCellCorrection.CaloCellCorrectionConf import CaloCellRandomizer
-## theCaloCellRandomizer=CaloCellRandomizer(noiseTool=theCaloNoiseTool,DoGaussRandomization=True)
+## theCaloCellRandomizer=CaloCellRandomizer(DoGaussRandomization=True)
## ToolSvc += theCaloCellRandomizer
## from CaloRec.CaloRecConf import CaloCellContainerCorrectorTool
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
index 5671f8a97799b46214e428a286e9d6141603515a..96167e08354913f0bc502a5b6aec309c89bf36ae 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/MsgStream.h"
@@ -18,7 +18,6 @@
#include "CaloEvent/CaloCellContainer.h"
#include "CaloEvent/CaloClusterContainer.h"
#include "CaloEvent/CaloTopoTowerContainer.h"
-#include "CaloInterface/ICalorimeterNoiseTool.h"
#include "CaloTopoTowerAlgorithm.h"
#include <string>
@@ -59,8 +58,6 @@ CaloTopoTowerAlgorithm::CaloTopoTowerAlgorithm(const std::string& name,
// Noise Tool stuff
declareProperty("DefaultNoiseSigma", m_noiseSigma = 10.0);
- declareProperty("UseCaloNoiseTool", m_useNoiseTool = false);
- declareProperty("UsePileUpNoise", m_usePileUpNoise = true);
declareProperty("CellEnergySignificance", m_cellESignificanceThreshold = -1);
// Calo from which to use cells
@@ -97,13 +94,6 @@ StatusCode CaloTopoTowerAlgorithm::initialize()
ATH_CHECK(m_towerContainerKey.initialize());
ATH_CHECK(m_newTowerContainerKey.initialize());
- // Report some information regarding the noise tool
- if ( m_useNoiseTool && m_usePileUpNoise) {
- ATH_MSG_DEBUG( "Pile-Up Noise from Noise Tool "
- << " is selected! The noise sigma will be the"
- << " quadratic sum of the electronics noise and the pile up!" );
- }
-
m_caloIndices.clear();
for ( unsigned int iCalos=0; iCalos< m_includedCalos.size(); iCalos++ )
{
@@ -268,8 +258,6 @@ StatusCode CaloTopoTowerAlgorithm::execute (const EventContext& ctx) const
theTowers->SetUseCellWeights(m_useCellWeights);
// Noise tool stuff
- theTowers->SetUseNoiseTool(m_useNoiseTool);
- theTowers->SetUsePileUpNoise(m_usePileUpNoise);
theTowers->SetNoiseSigma(m_noiseSigma);
theTowers->SetCellESignificanceThreshold(m_cellESignificanceThreshold);
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
index dded0c2350640b62cdd38175b339d3be3394fc79..12b4b8454f039e8f68f3a06e9e7558e66debc3b6 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOREC_CALOTOPOTOWERALGORITHM_H
@@ -87,8 +87,6 @@ class CaloTopoTowerAlgorithm : public AthReentrantAlgorithm
bool m_useCellWeights;
// Noise tool stuff
- bool m_useNoiseTool;
- bool m_usePileUpNoise;
float m_noiseSigma;
float m_cellESignificanceThreshold;