Merge branch 'removeInterimClusterContOption' into 'master'

comment out unused and MT-unfriendly option to store interim cluster containers

See merge request atlas/athena!16626

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:

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

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);

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