diff --git a/Calorimeter/CaloRec/python/CaloClusterGetterBase.py b/Calorimeter/CaloRec/python/CaloClusterGetterBase.py index 4758c54b0f85c7b5821b75d4f3acfcd754cf4644..557797cc0a0d9b17370e1e32ed8f4c045ca1afbc 100644 --- a/Calorimeter/CaloRec/python/CaloClusterGetterBase.py +++ b/Calorimeter/CaloRec/python/CaloClusterGetterBase.py @@ -48,9 +48,6 @@ class CaloClusterGetterBase (Configured): # The primary output class we produce. _outputType = "xAOD::CaloClusterContainer" - # This defaults to false. - _keepEachCorrection = False - def __init__ (self, seq = AlgSequence(), *args, **kw): self.seq = seq Configured.__init__ (self, *args, **kw) @@ -68,7 +65,6 @@ class CaloClusterGetterBase (Configured): maker = make_CaloClusterMaker (\ self._name, self._outputKey, - self._keepEachCorrection, maker_tools = self.makeMakerTools (input_getter.outputKey()), correction_tools = self.makeCorrectionTools ()) except: diff --git a/Calorimeter/CaloRec/python/CaloRecMakers.py b/Calorimeter/CaloRec/python/CaloRecMakers.py index 69ef2f3475a4d3b360f78e11fdb24cb9b7240c0b..cad398586407c0e69c96f3cd329ba1d0cef3ee0c 100644 --- a/Calorimeter/CaloRec/python/CaloRecMakers.py +++ b/Calorimeter/CaloRec/python/CaloRecMakers.py @@ -77,13 +77,11 @@ def make_CaloClusterCopier (name, output_name, copy_cells = False, use_ClusterPo def make_CaloClusterMaker (name, output_key, - keep_each_correction = False, maker_tools = [], correction_tools = []): alg = _makeconf (CaloClusterMaker, name, - ClustersOutputName = output_key, - KeepEachCorrection = keep_each_correction) + ClustersOutputName = output_key) alg.ClusterMakerTools = _process_tools (alg, maker_tools) alg.ClusterCorrectionTools = _process_tools (alg, correction_tools) return alg diff --git a/Calorimeter/CaloRec/src/CaloClusterMaker.cxx b/Calorimeter/CaloRec/src/CaloClusterMaker.cxx index fac3c1cec4e5fc900398c2517e4821015bf66602..20b364f66b7c34e5bf5d8a4783e02bdbe674fba9 100644 --- a/Calorimeter/CaloRec/src/CaloClusterMaker.cxx +++ b/Calorimeter/CaloRec/src/CaloClusterMaker.cxx @@ -66,7 +66,7 @@ CaloClusterMaker::CaloClusterMaker(const std::string& name, // Name(s) of Cluster Correction Tools declareProperty("ClusterCorrectionTools",m_clusterCorrectionTools); - declareProperty("KeepEachCorrection", m_keep_each_correction=false); + //MT-unfriendly: declareProperty("KeepEachCorrection", m_keep_each_correction=false); // Name(s) of Cluster Correction Tools (even field) to trigger the // recording of the current cluster container in StoreGate before @@ -171,6 +171,7 @@ StatusCode CaloClusterMaker::execute_r (const EventContext& ctx) const toolIt_e=m_clusterCorrectionTools.end(); for(;toolIt!=toolIt_e;++toolIt) { const std::string& toolname=(*toolIt).name(); + /*MT-unfriendly, drop for now. if (m_keep_each_correction) { const std::string interimContName=m_clusterOutput.key() + "-pre" +toolname; xAOD::CaloClusterContainer* interimCont=CaloClusterStoreHelper::makeContainer(&(*evtStore()),interimContName,msg()); @@ -178,7 +179,7 @@ StatusCode CaloClusterMaker::execute_r (const EventContext& ctx) const ATH_CHECK(CaloClusterStoreHelper::finalizeClusters(&(*evtStore()),interimCont, interimContName, msg())); } - + */ ATH_MSG_DEBUG(" Applying correction = " << toolname); const std::string chronoName = this->name() + "_" + toolname; if (m_chronoTools) m_chrono->chronoStart(chronoName); diff --git a/Calorimeter/CaloRec/src/CaloClusterMaker.h b/Calorimeter/CaloRec/src/CaloClusterMaker.h index f9120f42cbfd777f297f4ea6b35419639d71ae66..b490c417a485bd706d42645a3ec90f36687524d9 100644 --- a/Calorimeter/CaloRec/src/CaloClusterMaker.h +++ b/Calorimeter/CaloRec/src/CaloClusterMaker.h @@ -88,7 +88,7 @@ class CaloClusterMaker : public AthReentrantAlgorithm * * If true, we keep in StoreGate the complete list of clusters * before each correction has been performed. */ - bool m_keep_each_correction; + //MT-unfriendly:bool m_keep_each_correction; /** * @brief controls saving the uncalibrated signal state just before