Merge branch 'TrkMkr_THFix' into 'master'

disable unused CaloNoiseTool in Trigger-XYZCaloCellContMaker

See merge request atlas/athena!8418

Former-commit-id: d7dfd5e7

Trigger/TrigAlgorithms/TrigCaloRec/src/FullCaloCellContMaker.cxx

@@ -75,6 +75,9 @@ StatusCode FullCaloCellContMaker::initialize(){
       std::cout << name() << "     Asbolute E in sigma         set to " << (m_absEinSigma      ? "true" : "false") << std::endl;
    // }
   }
+  else {
+    m_noiseTool.disable();
+  }
   
 
   if( service( "TrigTimerSvc", m_timersvc).isFailure() ) {

Trigger/TrigAlgorithms/TrigCaloRec/src/RoIFCalEmCellContMaker.cxx

@@ -64,6 +64,9 @@ StatusCode RoIFCalEmCellContMaker::initialize(){
     if (sc!=StatusCode::SUCCESS) return sc;
 
   }
+  else {
+    m_noiseTool.disable();
+  }
 
   // Initialize timing service
 

Trigger/TrigAlgorithms/TrigCaloRec/src/RoIFCalHadCellContMaker.cxx

@@ -62,6 +62,8 @@ StatusCode RoIFCalHadCellContMaker::initialize(){
     StatusCode sc=toolSvc()->retrieveTool("LArCablingService",m_cablingSvc);
     if (sc!=StatusCode::SUCCESS) return sc;
 
+  } else {
+    m_noiseTool.disable();
   }
 
   // Initialize timing service

Trigger/TrigAlgorithms/TrigCaloRec/src/RoILArEMCellContMaker.cxx

@@ -62,6 +62,9 @@ StatusCode RoILArEMCellContMaker::initialize(){
     if (sc!=StatusCode::SUCCESS) return sc;
 
   }
+  else {
+    m_noiseTool.disable();
+  }
 
   if( service( "TrigTimerSvc", m_timersvc).isFailure() ) {
      std::cout << ": Unable to locate TrigTimer Service" << std::endl;

Trigger/TrigAlgorithms/TrigCaloRec/src/RoILArHadCellContMaker.cxx

@@ -62,6 +62,8 @@ StatusCode RoILArHadCellContMaker::initialize(){
     StatusCode sc=toolSvc()->retrieveTool("LArCablingService",m_cablingSvc);
     if (sc!=StatusCode::SUCCESS) return sc;
 
+  } else {
+    m_noiseTool.disable();
   }
 
   // Initialize timing service

Trigger/TrigAlgorithms/TrigCaloRec/src/RoITileCellContMaker.cxx

@@ -56,6 +56,8 @@ StatusCode RoITileCellContMaker::initialize(){
 
     std::cout << name() << " Two-Gaussian noise for Tile set to " << (m_twogaussiannoise ? "true" : "false") << std::endl;
 
+  } else {
+    m_noiseTool.disable();
   }
 
   if( service( "TrigTimerSvc", m_timersvc).isFailure() ) {

Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloFEBTool.cxx

@@ -88,6 +88,8 @@ StatusCode HLTCaloFEBTool::init() {
                 ATH_MSG_INFO( "Retrieved " << m_data  );
         }
 
+	ATH_CHECK(m_noisetool.retrieve());
+
 	return StatusCode::SUCCESS;
 
 }