diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.cxx b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.cxx
index dfe9b66dcb2dbb1e34f6878421ecad22ededc99f..2f3dbf5ff1eab7f1f74f41681ccdff2d8544200a 100644
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.cxx
@@ -4,7 +4,6 @@
//-----------------------------------------------------------------------
// File and Version Information:
-// $Id: CaloClusterMomentsMaker.cxx,v 1.23 2009-04-22 19:50:46 ssnyder Exp $
//
// Description: see CaloClusterMomentsMaker.h
//
@@ -160,12 +159,8 @@ CaloClusterMomentsMaker::CaloClusterMomentsMaker(const std::string& type,
declareProperty("TwoGaussianNoise",m_twoGaussianNoise);
declareProperty("LArHVFraction",m_larHVFraction,"Tool Handle for LArHVFraction");
- /// Not used anymore (with xAOD), but required to when configured from
- /// COOL via CaloRunClusterCorrections.
+ /// Not used anymore (with xAOD), but required when configured from COOL.
declareProperty("AODMomentsNames",m_momentsNamesAOD);
- /// Not used by this tool, but required to use this
- /// with CaloRunClusterCorrections.
- declareProperty("order", m_order = 0);
// Use weighting of neg. clusters option?
declareProperty("WeightingOfNegClusters", m_absOpt);
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.h b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.h
index a5b7f37bd162b588ece6403e0e76a0a6236ec48d..0f3622d0280b78d27007b6380495fe2ac22ed1a1 100644
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.h
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//Dear emacs, this is -*-c++-*-
@@ -7,7 +7,6 @@
#define CALOCLUSTERMOMENTSMAKER_H
/**
* @class CaloClusterMomentsMaker
- * @version \$Id: CaloClusterMomentsMaker.h,v 1.10 2009-04-22 19:50:46 ssnyder Exp $
* @author Sven Menke <menke@mppmu.mpg.de>
* @date 28-February-2005
* @brief Calculate moments for CaloCluster objects
@@ -127,19 +126,13 @@ class CaloClusterMomentsMaker: public AthAlgTool, virtual public CaloClusterColl
ToolHandle<ILArHVFraction> m_larHVFraction;
- /// Not used anymore (with xAOD), but required to when configured from
- /// COOL via CaloRunClusterCorrections.
+ /// Not used anymore (with xAOD), but required when configured from COOL.
std::string m_momentsNamesAOD;
/**
* @brief if set to true use abs E value of cells to calculate
* cluster moments */
bool m_absOpt;
-
-
- /// Not used by this tool, but required to use this
- /// with CaloRunClusterCorrections.
- int m_order;
};
#endif // CALOCLUSTERMOMENTSMAKER_H
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
index 9de4572a49816a0d21243cd44bb82949fc30a1b4..7562746299ecae26811f66625518a56f2f3a9158 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
@@ -3,7 +3,6 @@
*/
//-----------------------------------------------------------------------
// File and Version Information:
-// $Id: CaloClusterMomentsMaker.cxx,v 1.23 2009-04-22 19:50:46 ssnyder Exp $
//
// Description: see CaloClusterMomentsMaker.h
//
@@ -158,12 +157,8 @@ CaloClusterMomentsMaker_DigiHSTruth::CaloClusterMomentsMaker_DigiHSTruth(const s
declareProperty("LArHVFraction",m_larHVFraction,"Tool Handle for LArHVFraction");
declareProperty("WeightingOfNegClusters", m_absOpt);
- /// Not used anymore (with xAOD), but required to when configured from
- /// COOL via CaloRunClusterCorrections.
+ /// Not used anymore (with xAOD), but required when configured from COOL.
declareProperty("AODMomentsNames",m_momentsNamesAOD);
- /// Not used by this tool, but required to use this
- /// with CaloRunClusterCorrections.
- declareProperty("order", m_order = 0);
}
//###############################################################################
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h
index b19cb230f4882746f39ae5282dcb72537ddfa278..405671351256dedb7b3ad117e4f655a5cecc49c7 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.h
@@ -6,7 +6,6 @@
#define CALOCLUSTERMOMENTSMAKER_DigiHSTruth_H
/**
* @class CaloClusterMomentsMaker
- * @version \$Id: CaloClusterMomentsMaker.h,v 1.10 2009-04-22 19:50:46 ssnyder Exp $
* @author Sven Menke <menke@mppmu.mpg.de>
* @date 28-February-2005
* @brief Calculate moments for CaloCluster objects
@@ -128,17 +127,12 @@ class CaloClusterMomentsMaker_DigiHSTruth final: public extends<AthAlgTool, Calo
SG::ReadCondHandleKey<CaloNoise> m_noiseCDOKey{this,"CaloNoiseKey","totalNoise","SG Key of CaloNoise data object"};
ToolHandle<ILArHVFraction> m_larHVFraction;
- /// Not used anymore (with xAOD), but required to when configured from
- /// COOL via CaloRunClusterCorrections.
+ /// Not used anymore (with xAOD), but required when configured from COOL.
std::string m_momentsNamesAOD;
/**
* * @brief if set to true use abs E value of cells to calculate
* * cluster moments */
bool m_absOpt;
-
- /// Not used by this tool, but required to use this
- /// with CaloRunClusterCorrections.
- int m_order;
};
#endif // CALOCLUSTERMOMENTSMAKER_H
diff --git a/Calorimeter/CaloRec/src/ToolConstantsCondAlg.h b/Calorimeter/CaloRec/src/ToolConstantsCondAlg.h
index 6380d51c6b512f52c97bdbccf21c84079d177abf..c1c72fb758a74f8bc404097e0ce5f7f6ada996db 100644
--- a/Calorimeter/CaloRec/src/ToolConstantsCondAlg.h
+++ b/Calorimeter/CaloRec/src/ToolConstantsCondAlg.h
@@ -61,7 +61,7 @@ private:
{ this, "COOLFolderKey", "", "Name of COOL folder" };
StringProperty m_detStoreKey
- { this, "DetStoreKey", "", "Key in DetetorStore of ToolConstants object." };
+ { this, "DetStoreKey", "", "Key in DetectorStore of ToolConstants object." };
SG::WriteCondHandleKey<CaloRec::ToolConstants> m_toolConstantsKey
{ this, "ToolConstantsKey", "", "SG key of output ToolConstants object" };
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ClusterCorrectionD3PD.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ClusterCorrectionD3PD.py
index 82429aa0594e5e60ab2aea2a4098afefce484394..53db19b7ead02f7628da4364fb4e63c3b23da468 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ClusterCorrectionD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ClusterCorrectionD3PD.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id$
#
# @file egammaD3PDMaker/python/ClusterCorrectionD3PD.py
# @author scott snyder <snyder@bnl.gov>
@@ -25,23 +24,25 @@ def addCluster (alg, typ, eta_size, phi_size, prefix):
prealg = AlgSequence (D3PDMakerFlags.PreD3PDAlgSeqName())
getter = make_CorrectionClusterGetter(typ, eta_size, phi_size)(seq = prealg)
sgkey = getter.outputKey()
- runner = [c for c in getter.caloClusterMakerHandle().getChildren()
- if c.getName().startswith ('CaloRunClusterCorrections')][0]
- tokeep = ['rfac', 'etaoffb1', 'gap', 'calhits', 'phimod', 'etamod']
- keeplist = []
- for c in tokeep:
- keeplist.append (c)
- keeplist.append ('pre' + c + '_' + sgkey)
- runner.KeepList = keeplist
+ # Needs to be redone now that CaloRunClusterCorrections is gone.
+ # Leave this commented out for now.
+ #runner = [c for c in getter.caloClusterMakerHandle().getChildren()
+ # if c.getName().startswith ('CaloRunClusterCorrections')][0]
+ #tokeep = ['rfac', 'etaoffb1', 'gap', 'calhits', 'phimod', 'etamod']
+ #keeplist = []
+ #for c in tokeep:
+ # keeplist.append (c)
+ # keeplist.append ('pre' + c + '_' + sgkey)
+ #runner.KeepList = keeplist
alg += CorrectionClusterD3PDObject (10,
sgkey = sgkey,
prefix = prefix)
- for c in tokeep:
- alg += CorrectionClusterD3PDObject (10,
- sgkey = 'pre' + c + '_' + sgkey,
- prefix = prefix + 'pre' + c + '_')
+ #for c in tokeep:
+ # alg += CorrectionClusterD3PDObject (10,
+ # sgkey = 'pre' + c + '_' + sgkey,
+ # prefix = prefix + 'pre' + c + '_')
return
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
index 382cd2919447f0890b78a235c9d1e240f3327708..707497ce190b4b494a967db26b7637d9060481e2 100644
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
@@ -195,9 +195,6 @@ def configureClusterCorrections(slwAlg):
from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
clusterTypes = ("ele37","ele55")
for cl in clusterTypes:
- clName = "CaloRunClusterCorrections"+cl
- if hasattr(slwAlg,clName):
- continue
for tool in make_CaloSwCorrections (cl,version=EgammaSliceFlags.clusterCorrectionVersion()):
slwAlg += tool
slwAlg.ClusterCorrectionTools += [tool.getFullName()]