From e67fe34acce8e01d569121ee34ed48b280a30445 Mon Sep 17 00:00:00 2001
From: Walter Lampl <walter.lampl@cern.ch>
Date: Tue, 23 Nov 2021 12:06:33 +0100
Subject: [PATCH] rename uncalibrated TopoCluster container CaloTopoCluster ->
CaloTopoClusters (plural)
---
.../CaloCalibHitRec/share/jobOptions_SimpleCaloRec.py | 2 +-
.../share/CaloTopoLocalCalib_jobOptions.py | 4 ++--
.../CaloCnv/CaloJiveXML/share/CaloJiveXML_DataTypes.py | 2 +-
.../CaloExample/CaloHiveEx/share/CaloHiveDeps.py | 6 +++---
.../CaloExample/CaloHiveEx/share/CaloHiveJets.py | 4 ++--
.../share/GetLCClassification_jobOptions.py | 2 +-
.../share/GetLCDeadMaterialTree_jobOptions.py | 4 ++--
.../share/GetLCOutOfCluster_jobOptions.py | 2 +-
.../share/GetLCSinglePionsPerf_jobOptions.py | 4 ++--
.../CaloLocalHadCalib/share/GetLCWeights_jobOptions.py | 2 +-
.../CaloLocalHadCalib/src/GetLCClassification.cxx | 2 +-
.../CaloLocalHadCalib/src/GetLCDeadMaterialTree.cxx | 2 +-
.../CaloLocalHadCalib/src/GetLCOutOfCluster.cxx | 2 +-
Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx | 2 +-
Calorimeter/CaloRec/python/CaloClusterTopoGetter.py | 10 +++++-----
.../CaloRec/share/CaloRecOutputItemList_jobOptions.py | 2 +-
Calorimeter/CaloRec/share/CaloRec_jobOptions.py | 2 +-
Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx | 2 +-
.../CaloRec/src/CaloTopoTowerFromClusterMaker.cxx | 2 +-
.../CaloRec/src/CaloTopoTowerFromClusterMaker.h | 2 +-
Commission/CommissionUtils/share/RecoCosmic.py | 2 +-
.../EventTagRawAlgs/src/RawInfoSummaryForTagWriter.cxx | 2 +-
.../MuonCombinedBaseTools/src/MuonCaloTagTool.h | 2 +-
.../RecExCommon/share/RecExCommon_topOptions.py | 2 +-
.../RecExample/RecExTB/share/RecExTB_H6_jobOptions.py | 2 +-
.../eflowRec/eflowRec/PFClusterSelectorTool.h | 2 +-
Reconstruction/eflowRec/python/PFRun3Config.py | 3 ---
.../egamma/egammaAlgs/src/egammaTopoClusterCopier.h | 2 +-
.../egamma/egammaRec/python/egammaRecFlags.py | 2 +-
TestBeam/TBRec/src/TBBeamQualityMC.cxx | 2 +-
30 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/Calorimeter/CaloCalibHitRec/share/jobOptions_SimpleCaloRec.py b/Calorimeter/CaloCalibHitRec/share/jobOptions_SimpleCaloRec.py
index 7151b5fd3f4..bbc544f1a82 100644
--- a/Calorimeter/CaloCalibHitRec/share/jobOptions_SimpleCaloRec.py
+++ b/Calorimeter/CaloCalibHitRec/share/jobOptions_SimpleCaloRec.py
@@ -174,7 +174,7 @@ theCBNT_CaloClusterTopoW=CBNTAA_CaloCluster("CBNT_CaloClusterTopoW")
CBNT_AthenaAware += CBNTAA_CaloCluster("CBNT_CaloClusterTopoOOC")
theCBNT_CaloClusterTopoOOC=CBNTAA_CaloCluster("CBNT_CaloClusterTopoOOC")
-theCBNT_CaloClusterTopoEM.ClusterColl = "CaloTopoCluster"
+theCBNT_CaloClusterTopoEM.ClusterColl = "CaloTopoClusters"
theCBNT_CaloClusterTopoEM.Suffix = "_topo_em"
theCBNT_CaloClusterTopoEM.EMOnly = FALSE
theCBNT_CaloClusterTopoEM.MaxCaloCluster = 600
diff --git a/Calorimeter/CaloClusterCorrection/share/CaloTopoLocalCalib_jobOptions.py b/Calorimeter/CaloClusterCorrection/share/CaloTopoLocalCalib_jobOptions.py
index 65159a9a1e5..7c4bc5defbb 100755
--- a/Calorimeter/CaloClusterCorrection/share/CaloTopoLocalCalib_jobOptions.py
+++ b/Calorimeter/CaloClusterCorrection/share/CaloTopoLocalCalib_jobOptions.py
@@ -14,8 +14,8 @@ CaloTopoClusterMaker.ClusterCorrectionTools += [
# use new name for calibrated clusters and old name for em-scale clusters
-CaloTopoClusterMaker.ClustersOutputName = "CaloCalTopoCluster"
-CaloTopoClusterMaker.KeepCorrectionToolAndContainerNames += ["CaloClusterLocalCalib/LocalCalib","CaloTopoCluster"]
+CaloTopoClusterMaker.ClustersOutputName = "CaloCalTopoClusters"
+CaloTopoClusterMaker.KeepCorrectionToolAndContainerNames += ["CaloClusterLocalCalib/LocalCalib","CaloTopoClusters"]
CaloTopoClusterMaker.KeepCorrectionToolAndContainerNames += ["CaloClusterLocalCalib/OOCCalib","CaloWeightTopoCluster"]
CaloTopoClusterMaker.TopoMoments.MomentsNames += [
"FIRST_ETA",
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/share/CaloJiveXML_DataTypes.py b/Calorimeter/CaloCnv/CaloJiveXML/share/CaloJiveXML_DataTypes.py
index e0a674374fc..920de0ae15a 100644
--- a/Calorimeter/CaloCnv/CaloJiveXML/share/CaloJiveXML_DataTypes.py
+++ b/Calorimeter/CaloCnv/CaloJiveXML/share/CaloJiveXML_DataTypes.py
@@ -22,7 +22,7 @@ theCaloClusterRetriever.FavouriteClusterCollection="egClusterCollection"
## example how to set other collection. when commented out: all other, non-HLT
##
-theCaloClusterRetriever.OtherClusterCollections=["CombinedCluster","MuonClusterCollection","CaloTopoCluster"]
+theCaloClusterRetriever.OtherClusterCollections=["CombinedCluster","MuonClusterCollection","CaloTopoClusters"]
# See M5 jOs for further commissioning options
#
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveDeps.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveDeps.py
index 05a4a3e7054..e14b6f80eef 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveDeps.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveDeps.py
@@ -38,9 +38,9 @@ topSequence.CaloTopoCluster.ExtraInputs = [('CaloCalibrationHitContainer','Stor
('CaloCellContainer','StoreGateSvc+AllCalo')]
topSequence.CaloTopoCluster.ExtraOutputs = [('xAOD::CaloClusterContainer','StoreGateSvc+CaloCalTopoClusters'),
('xAOD::CaloClusterAuxContainer','StoreGateSvc+CaloCalTopoClustersAux.'),
- ('xAOD::CaloClusterContainer','StoreGateSvc+CaloTopoCluster'),
- ('xAOD::CaloClusterAuxContainer','StoreGateSvc+CaloTopoClusterAux.'),
- ('CaloClusterCellLinkContainer','StoreGateSvc+CaloTopoCluster_links'),
+ ('xAOD::CaloClusterContainer','StoreGateSvc+CaloTopoClusters'),
+ ('xAOD::CaloClusterAuxContainer','StoreGateSvc+CaloTopoClustersAux.'),
+ ('CaloClusterCellLinkContainer','StoreGateSvc+CaloTopoClusters_links'),
('CaloClusterCellLinkContainer','StoreGateSvc+CaloCalTopoClusters_links')]
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveJets.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveJets.py
index 4e9aab22c90..0947f7ef45c 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveJets.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveJets.py
@@ -42,7 +42,7 @@ jalg4 = JetAlgorithm("jetalg4")
j4 = JetRecTool("jetrectool4",OutputContainer="AntiKt4EMTopoJets")
g4 = PseudoJetGetter(
"emget4",
- InputContainer = "CaloTopoCluster",
+ InputContainer = "CaloTopoClusters",
Label = "EMTopo",
OutputContainer = "PseudoJetEMTopo4",
SkipNegativeEnergy = True,
@@ -78,7 +78,7 @@ for x in range(0, nJets):
j = JetRecTool("jetrectool"+app,OutputContainer=out,OutputLevel=OutLevel)
g = PseudoJetGetter(
"emget"+app,
- InputContainer = "CaloTopoCluster",
+ InputContainer = "CaloTopoClusters",
Label = "EMTopo",
OutputContainer = "PseudoJetEMTopo"+app,
SkipNegativeEnergy = True,
diff --git a/Calorimeter/CaloLocalHadCalib/share/GetLCClassification_jobOptions.py b/Calorimeter/CaloLocalHadCalib/share/GetLCClassification_jobOptions.py
index 4cc947de59e..4cac7dc362f 100644
--- a/Calorimeter/CaloLocalHadCalib/share/GetLCClassification_jobOptions.py
+++ b/Calorimeter/CaloLocalHadCalib/share/GetLCClassification_jobOptions.py
@@ -23,6 +23,6 @@ GetLCC.OutputFileName = outFileNameLCC
# 'log10(<rho_cell (MeV/mm^3)>)-log10(E_clus (MeV))': ('log10(<rho_cell (MeV/mm^3)>)-log10(E_clus (MeV))',-9.0,-4.0,20),
# 'log10(lambda_clus (mm))': ('log10(lambda_clus (mm))',0.0,4.0,20)}
#
-GetLCC.ClusterCollectionName = "CaloTopoCluster"
+GetLCC.ClusterCollectionName = "CaloTopoClusters"
topSequence += GetLCC
diff --git a/Calorimeter/CaloLocalHadCalib/share/GetLCDeadMaterialTree_jobOptions.py b/Calorimeter/CaloLocalHadCalib/share/GetLCDeadMaterialTree_jobOptions.py
index a1a2e784fef..4d2475bee59 100644
--- a/Calorimeter/CaloLocalHadCalib/share/GetLCDeadMaterialTree_jobOptions.py
+++ b/Calorimeter/CaloLocalHadCalib/share/GetLCDeadMaterialTree_jobOptions.py
@@ -8,8 +8,8 @@ from AthenaCommon.AlgSequence import AlgSequence
GetLCDM = GetLCDeadMaterialTree("GetLCDM")
GetLCDM.HadDMCoeffInitFile = "CaloHadDMCoeff_init_v2.txt"
-GetLCDM.ClusterCollectionName = "CaloTopoCluster"
-GetLCDM.ClusterCollectionNameCalib = "CaloCalTopoCluster"
+GetLCDM.ClusterCollectionName = "CaloTopoClusters"
+GetLCDM.ClusterCollectionNameCalib = "CaloCalTopoClusters"
GetLCDM.doSaveCalibClusInfo = False # to save additional info from collection with calibrated clusters
if 'outFileNameLCDM' in dir():
GetLCDM.OutputFileName = outFileNameLCDM
diff --git a/Calorimeter/CaloLocalHadCalib/share/GetLCOutOfCluster_jobOptions.py b/Calorimeter/CaloLocalHadCalib/share/GetLCOutOfCluster_jobOptions.py
index 0a409fd2746..c271183a269 100644
--- a/Calorimeter/CaloLocalHadCalib/share/GetLCOutOfCluster_jobOptions.py
+++ b/Calorimeter/CaloLocalHadCalib/share/GetLCOutOfCluster_jobOptions.py
@@ -23,6 +23,6 @@ GetLCO.OutputFileName = outFileNameLCO
# 'log10(lambda_clus (mm))': ('log10(lambda_clus (mm))',0.0,4.0,20),
# 'weight': ('weight',0.,5.,1)}
#
-GetLCO.ClusterCollectionName = "CaloTopoCluster"
+GetLCO.ClusterCollectionName = "CaloTopoClusters"
topSequence += GetLCO
diff --git a/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf_jobOptions.py b/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf_jobOptions.py
index 2549a14b2e4..6d980d075af 100644
--- a/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf_jobOptions.py
+++ b/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf_jobOptions.py
@@ -10,10 +10,10 @@ from math import pi
lcPerf = GetLCSinglePionsPerf("LocalHadPerformance")
# collection name to study cluster moments
-lcPerf.ClusterBasicCollName = "CaloTopoCluster"
+lcPerf.ClusterBasicCollName = "CaloTopoClusters"
# collections names to study engReco wrt Truth after different correction steps
-lcPerf.ClusterCollectionNames = ["CaloTopoCluster", "CaloWTopoCluster", "CaloOOCTopoCluster", "CaloCalTopoClusters"]
+lcPerf.ClusterCollectionNames = ["CaloTopoClusters", "CaloWTopoCluster", "CaloOOCTopoCluster", "CaloCalTopoClusters"]
#lcPerf.ClusterCollectionNames = ["CaloTopoCluster_EMAll", "CaloWTopoCluster_EMAll", "CaloOOCTopoCluster_EMAll", "CaloCalTopoCluster_EMAll"]
#lcPerf.ClusterCollectionNames = ["CaloTopoCluster_HadAll", "CaloWTopoCluster_HadAll", "CaloOOCTopoCluster_HadAll", "CaloCalTopoCluster_HadAll"]
diff --git a/Calorimeter/CaloLocalHadCalib/share/GetLCWeights_jobOptions.py b/Calorimeter/CaloLocalHadCalib/share/GetLCWeights_jobOptions.py
index 31bf88a3468..45db078c427 100644
--- a/Calorimeter/CaloLocalHadCalib/share/GetLCWeights_jobOptions.py
+++ b/Calorimeter/CaloLocalHadCalib/share/GetLCWeights_jobOptions.py
@@ -32,7 +32,7 @@ GetLCW.UseInversionMethod = True
# 'EMB2:log10(rho_cell (MeV/mm^3))': ('log10(rho_cell (MeV/mm^3))',-7.0,1.0,20),
# 'EMB2:weight': ('weight',-2.0,3.0,1)}
#
-GetLCW.ClusterCollectionName = "CaloTopoCluster"
+GetLCW.ClusterCollectionName = "CaloTopoClusters"
GetLCW.CalibrationHitContainerNames = ["LArCalibrationHitInactive"
,"LArCalibrationHitActive"
,"TileCalibHitInactiveCell"
diff --git a/Calorimeter/CaloLocalHadCalib/src/GetLCClassification.cxx b/Calorimeter/CaloLocalHadCalib/src/GetLCClassification.cxx
index 96ea7857f01..b9598048619 100644
--- a/Calorimeter/CaloLocalHadCalib/src/GetLCClassification.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/GetLCClassification.cxx
@@ -43,7 +43,7 @@ GetLCClassification::GetLCClassification(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
m_outputFile(nullptr),
- m_clusterCollName("CaloTopoCluster"),
+ m_clusterCollName("CaloTopoClusters"),
m_NormalizationType("Lin"),
m_NormalizationTypeNumber(0),
m_ClassificationType("None"),
diff --git a/Calorimeter/CaloLocalHadCalib/src/GetLCDeadMaterialTree.cxx b/Calorimeter/CaloLocalHadCalib/src/GetLCDeadMaterialTree.cxx
index 20ab84f7aff..2c55d6f1074 100644
--- a/Calorimeter/CaloLocalHadCalib/src/GetLCDeadMaterialTree.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/GetLCDeadMaterialTree.cxx
@@ -63,7 +63,7 @@ GetLCDeadMaterialTree::GetLCDeadMaterialTree(const std::string& name,
m_outputTree(nullptr),
m_outputFileName("DeadMaterialTree.root"),
m_outputFile(nullptr),
- m_clusterCollName("CaloTopoCluster"),
+ m_clusterCollName("CaloTopoClusters"),
m_HadDMCoeff(nullptr),
m_data(nullptr),
m_doSaveCalibClusInfo(false),
diff --git a/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx b/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx
index c8bdf3a2e47..43474afb2f9 100644
--- a/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx
@@ -42,7 +42,7 @@ GetLCOutOfCluster::GetLCOutOfCluster(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
m_outputFile(nullptr),
- m_clusterCollName("CaloTopoCluster"),
+ m_clusterCollName("CaloTopoClusters"),
m_NormalizationType("Lin"),
m_NormalizationTypeNumber(0),
m_ClassificationType("None"),
diff --git a/Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx b/Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx
index 28c56b33268..bff9b19b847 100644
--- a/Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx
@@ -46,7 +46,7 @@ GetLCWeights::GetLCWeights(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
m_outputFile(nullptr),
- m_clusterCollName("CaloTopoCluster"),
+ m_clusterCollName("CaloTopoClusters"),
m_useInversionMethod(true),
m_NormalizationType("Lin"),
m_NormalizationTypeNumber(0),
diff --git a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py b/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
index 81d03a6fa70..3bee11446d5 100644
--- a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
+++ b/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
@@ -61,13 +61,13 @@ class CaloClusterTopoGetter ( Configured ) :
_outputType = "CaloClusterContainer" # the main (AOD) object type
if jobproperties.CaloTopoClusterFlags.doTopoClusterLocalCalib() or jobproperties.CaloTopoClusterFlags.doCellWeightCalib():
_outputKey = "CaloCalTopoClusters" # the main (AOD) object key
- _output = { _outputType : ["CaloCalTopoClusters","CaloTopoCluster"],
+ _output = { _outputType : ["CaloCalTopoClusters","CaloTopoClusters"],
"xAOD::CaloClusterAuxContainer" : ["CaloTopoClusterAux.","CaloCalTopoClustersAux."],
"CaloClusterCellLinkContainer" : ["CaloCalTopoClusters_links","CaloTopoCluster_links"]
}
else:
- _outputKey = "CaloTopoCluster" # the main (AOD) object key
- _output = { _outputType : "CaloTopoCluster",
+ _outputKey = "CaloTopoClusters" # the main (AOD) object key
+ _output = { _outputType : "CaloTopoClusters",
"xAOD::CaloClusterAuxContainer" : "CaloTopoClusterAux.",
"CaloClusterCellLinkContainer" : "CaloTopoCluster_links"
}
@@ -338,7 +338,7 @@ class CaloClusterTopoGetter ( Configured ) :
- theCaloClusterSnapshot=CaloClusterSnapshot(OutputName="CaloTopoCluster",SetCrossLinks=True)
+ theCaloClusterSnapshot=CaloClusterSnapshot(OutputName="CaloTopoClusters",SetCrossLinks=True)
# maker tools
@@ -431,7 +431,7 @@ class CaloClusterTopoGetter ( Configured ) :
if jobproperties.CaloTopoClusterFlags.doTopoClusterLocalCalib():
CaloTopoCluster.ClustersOutputName="CaloCalTopoClusters"
else:
- CaloTopoCluster.ClustersOutputName="CaloTopoCluster"
+ CaloTopoCluster.ClustersOutputName="CaloTopoClusters"
CaloTopoCluster.ClusterMakerTools = [TopoMaker, TopoSplitter]
from CaloClusterCorrection.CaloClusterBadChannelListCorr import CaloClusterBadChannelListCorr
diff --git a/Calorimeter/CaloRec/share/CaloRecOutputItemList_jobOptions.py b/Calorimeter/CaloRec/share/CaloRecOutputItemList_jobOptions.py
index 14365aceadf..82bf6566415 100644
--- a/Calorimeter/CaloRec/share/CaloRecOutputItemList_jobOptions.py
+++ b/Calorimeter/CaloRec/share/CaloRecOutputItemList_jobOptions.py
@@ -40,7 +40,7 @@ CaloClusterKeys+=["EMTopoSW35"]
#CaloClusterKeys+=["LArClusterEMSofte"]
if rec.Commissioning():
- # CaloClusterKeys += ["LArMuClusterCandidates","CaloTopoCluster","EMTopoCluster420","TileTopoCluster","MuonClusterCollection"]
+ # CaloClusterKeys += ["LArMuClusterCandidates","CaloTopoClusters","EMTopoCluster420","TileTopoCluster","MuonClusterCollection"]
CaloClusterKeys += ["MuonClusterCollection"]
for theKey in CaloClusterKeys:
diff --git a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
index 2a500d27c03..25a3e9b8f0c 100644
--- a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
+++ b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
@@ -354,7 +354,7 @@ if rec.doWritexAOD():
from xAODCaloEventCnv.xAODCaloEventCnvConf import ClusterCreator
topSequence+=ClusterCreator("CaloCluster2xAOD")
- #CaloClusterKeys=("CaloCalTopoCluster", "CaloTopoCluster", "EMTopoCluster430", "LArClusterEM", "LArClusterEM7_11Nocorr",
+ #CaloClusterKeys=("CaloCalTopoClusters", "CaloTopoClusters", "EMTopoCluster430", "LArClusterEM", "LArClusterEM7_11Nocorr",
# "CombinedCluster","EMTopoSW35","egClusterCollection","LArClusterEMSofte")
#for k in CaloClusterKeys:
# itemname="CaloClusterContainer#"+k
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
index 06d2b1a6cf9..ecb1c472fe1 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
@@ -30,7 +30,7 @@ CaloTopoTowerAlgorithm::CaloTopoTowerAlgorithm(const std::string& name,
, m_genericLink(true)
, m_ptools( this )
, m_cellContainerKey("AllCalo")
- , m_clusterKey("CaloTopoCluster")
+ , m_clusterKey("CaloTopoClusters")
, m_cellToClusterMapKey("CaloCell2TopoCluster")
, m_towerContainerKey("CmbTower")
, m_newTowerContainerKey("TopoTower")
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx
index 32a26459a2b..aaf92b6285e 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx
@@ -52,7 +52,7 @@ CaloTopoTowerFromClusterMaker::CaloTopoTowerFromClusterMaker(const std::string&
const std::string& name,
const IInterface* pParent)
: AthAlgTool(type,name,pParent)
- , m_clusterContainerKey("CaloTopoCluster")
+ , m_clusterContainerKey("CaloTopoClusters")
, m_cellContainerKey("AllCalo")
, m_energyThreshold(m_energyThresholdDef-1.)
, m_clusterRange(m_clusterRangeDef)
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h
index c0bb2e2bfaa..35c5ea4d8bc 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h
@@ -203,7 +203,7 @@ inline bool CaloTopoTowerFromClusterMaker::isVa
/// <tr>
/// <td align="left" valign="top"><tt>ClusterContainerKey</tt></td>
/// <td align="center" valign="top"><tt>SG::ReadHandleKey<xAOD::CaloClusterContainer></tt></td>
-/// <td align="center" valign="top"><tt>"CaloTopoCluster"</tt></td>
+/// <td align="center" valign="top"><tt>"CaloTopoClusters"</tt></td>
/// <td align="left" valign="top">cluster container key is needed to pick up @c xAOD::CaloClusterContainer for filtered mode (<tt>UseCellsFromCluster = true</tt>)
/// </tr>
/// <tr>
diff --git a/Commission/CommissionUtils/share/RecoCosmic.py b/Commission/CommissionUtils/share/RecoCosmic.py
index 7f24f6f9e25..41371572c9b 100644
--- a/Commission/CommissionUtils/share/RecoCosmic.py
+++ b/Commission/CommissionUtils/share/RecoCosmic.py
@@ -52,7 +52,7 @@ CaloTopoClusterMaker.TopoCluster.CalorimeterNames=[ "TILE" ]
# slim cells
theApp.TopAlg +=["CaloClusterCellSlimmer/slimmer"]
slimmer = Algorithm("slimmer")
-slimmer.ClusterContainerNames = ["EMTopoCluster","CaloTopoCluster"]
+slimmer.ClusterContainerNames = ["EMTopoCluster","CaloTopoClusters"]
slimmer.CellContainerName = "ClusterOnly"
diff --git a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/RawInfoSummaryForTagWriter.cxx b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/RawInfoSummaryForTagWriter.cxx
index d33cbc6f12a..5103b1f79ad 100644
--- a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/RawInfoSummaryForTagWriter.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/RawInfoSummaryForTagWriter.cxx
@@ -26,7 +26,7 @@ RawInfoSummaryForTagWriter::RawInfoSummaryForTagWriter(const std::string& name,
{
declareProperty("IDTrackKey",m_sgKeyIDtrack);
declareProperty("CaloCellContKey", m_cellContKey="AllCalo");
- declareProperty("CaloClusterKey",m_caloClusterKey="CaloTopoCluster");
+ declareProperty("CaloClusterKey",m_caloClusterKey="CaloTopoClusters");
declareProperty("LArCollTimeName", m_larCollTimeName="LArCollisionTime");
declareProperty("doClusterSums",m_doClusterSums=true);
declareProperty("TRT_DriftCircleContainerName", m_TRT_DriftCircleName="TRT_DriftCircles");
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
index e4ad5a92f0e..da0ca225291 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
@@ -64,7 +64,7 @@ namespace MuonCombined {
void showTrackInfo(const Trk::TrackParameters* par) const;
// --- StoreGate keys ---
- SG::ReadHandleKey<xAOD::CaloClusterContainer> m_caloClusterCont{this, "CaloClusters", "CaloTopoCluster", "calo cluster container"};
+ SG::ReadHandleKey<xAOD::CaloClusterContainer> m_caloClusterCont{this, "CaloClusters", "CaloTopoClusters", "calo cluster container"};
SG::ReadHandleKey<CaloCellContainer> m_caloCellCont{this, "CaloCells", "AllCalo", "calo cell container"};
// --- Internal cache ---
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 2484f60a86f..db8214bfacd 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -447,7 +447,7 @@ if recAlgs.doEFlow():
if rec.doEgamma():
# C.A uses Clusters RecExCommom Cluster (rm the "s")
ConfigFlags.Egamma.Keys.Internal.EgammaTopoClusters = 'egammaTopoCluster'
- ConfigFlags.Egamma.Keys.Input.TopoClusters = 'CaloTopoCluster'
+ ConfigFlags.Egamma.Keys.Input.TopoClusters = 'CaloTopoClusters'
if rec.doHeavyIon():
# This is copy from the old style to the new
diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py
index 58c32b3e049..f2becdedf14 100755
--- a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py
+++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py
@@ -850,7 +850,7 @@ if doCBNT:
from CaloRec.CaloRecConf import CBNTAA_CaloCluster
if doTopoClusterLocalCalib:
CBNT_CaloClusterTopoEM = CBNTAA_CaloCluster("CBNT_CaloClusterTopoEM" )
- CBNT_CaloClusterTopoEM.ClusterColl = "CaloTopoCluster"
+ CBNT_CaloClusterTopoEM.ClusterColl = "CaloTopoClusters"
CBNT_CaloClusterTopoEM.Suffix = "_topo_em"
CBNT_CaloClusterTopoEM.EMOnly = False
CBNT_CaloClusterTopoEM.UseLink = True
diff --git a/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h b/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h
index 68db5d7b181..6a960233aac 100644
--- a/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h
+++ b/Reconstruction/eflowRec/eflowRec/PFClusterSelectorTool.h
@@ -31,7 +31,7 @@ private:
void retrieveLCCalCellWeight(const double& energy, const unsigned& index, std::map<IdentifierHash,double>& cellsWeight,const xAOD::CaloClusterContainer& caloCalClustersContainer,const CaloDetDescrManager& calo_dd_man);
/** ReadHandleKey for the CaloClusterContainer to be used as input */
- SG::ReadHandleKey<xAOD::CaloClusterContainer> m_caloClustersReadHandleKey{this,"clustersName","CaloTopoCluster","ReadHandleKey for the CaloClusterContainer to be used as input"};
+ SG::ReadHandleKey<xAOD::CaloClusterContainer> m_caloClustersReadHandleKey{this,"clustersName","CaloTopoClusters","ReadHandleKey for the CaloClusterContainer to be used as input"};
/** ReadHandleKey for the CaloClusterContainer, at LC scale, to be used as input */
SG::ReadHandleKey<xAOD::CaloClusterContainer> m_caloCalClustersReadHandleKey{this,"calClustersName","CaloCalTopoClusters","ReadHandleKey for the CaloClusterContainer, at LC scale, to be used as input"};
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 8713c5ad3ea..423c20be165 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -10,10 +10,7 @@ def getOfflinePFAlgorithm(inputFlags):
from eflowRec.PFCfg import getPFClusterSelectorTool
- #The name of the topoclusters is different in the new and old style configs.
topoClustersName="CaloTopoClusters"
- if inputFlags.PF.useRecExCommon:
- topoClustersName="CaloTopoCluster"
PFAlgorithm.PFClusterSelectorTool = getPFClusterSelectorTool(topoClustersName,"CaloCalTopoClusters","PFClusterSelectorTool")
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
index eb245c51690..6a4523c58a4 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
@@ -50,7 +50,7 @@ public:
private:
SG::ReadHandleKey<xAOD::CaloClusterContainer> m_inputTopoCollection {this,
- "InputTopoCollection", "CaloTopoCluster", "input topocluster collection"};
+ "InputTopoCollection", "CaloTopoClusters", "input topocluster collection"};
SG::WriteHandleKey<xAOD::CaloClusterContainer> m_outputTopoCollectionShallow {this,
"OutputTopoCollectionShallow", "tmp_egammaTopoCluster",
diff --git a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
index 5499127a552..c121764aae9 100755
--- a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
@@ -111,7 +111,7 @@ class inputTopoClusterCollection (JobProperty):
"""
statusOn = True
allowedTypes = ['str']
- StoredValue = 'CaloTopoCluster'
+ StoredValue = 'CaloTopoClusters'
class egammaTopoClusterCollection (JobProperty):
diff --git a/TestBeam/TBRec/src/TBBeamQualityMC.cxx b/TestBeam/TBRec/src/TBBeamQualityMC.cxx
index 799a07d6b32..5454b788ba6 100644
--- a/TestBeam/TBRec/src/TBBeamQualityMC.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityMC.cxx
@@ -28,7 +28,7 @@ TBBeamQualityMC::TBBeamQualityMC(const std::string & name, ISvcLocator * pSvcLoc
declareProperty("CheckVetoScint",m_check_veto=true);
declareProperty("CheckClusters",m_check_clus=false);
declareProperty("CheckTrackReco",m_check_trackreco=false);
- declareProperty("ClusterCollectionName",m_clusterCollName="CaloTopoCluster");
+ declareProperty("ClusterCollectionName",m_clusterCollName="CaloTopoClusters");
}
StatusCode TBBeamQualityMC::initialize() {
--
GitLab