From 84b383f7d1c5d93fba0749215328c12471369d94 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Mon, 13 Nov 2017 19:46:02 +0000
Subject: [PATCH] Merge branch 'fix_LArNoisyROMon' into '21.0'
hack to fix the MP tests failing safeDelete
See merge request !6470
(cherry picked from commit 8b938cad14dd2ffd3d01b8c09e2b81f3464bdb26 [formerly 068e917c8d3498d1cbe1ddc60f2c1af82c4b663c])
5b26423f hack to fix the MP tests failing safeDelete
3ba51e5f correct fix for LArNoisyROMon crash
Former-commit-id: 6814e89174515e3b3b4227b54364f29a2dd73084
---
LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
index f945bd6ed89..d3425a15c7c 100644
--- a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
@@ -60,6 +60,7 @@ LArNoisyROMon::~LArNoisyROMon()
if ( m_strHelper ) delete m_strHelper;
// don't delete m_NoiseTimeTree, it is not owned by this alg.
+
}
@@ -778,8 +779,8 @@ void LArNoisyROMon::fillTriggerHisto(partitionHistos& partition, uint8_t trigger
StatusCode LArNoisyROMon::finalize()
{
- ATH_MSG_INFO( " in LArNoisyROMon::finalHists()" );
- // delete temposary histograms
+ ATH_MSG_INFO( " in LArNoisyROMon::finalize() " );
+ // delete temposary histograms
if ( m_h_LBN ) {
LWHist::safeDelete(m_h_LBN);
@@ -787,8 +788,8 @@ StatusCode LArNoisyROMon::finalize()
}
// for (partitionHistos* part : {&m_BarrelA, &m_BarrelC, &m_EMECA, &m_EMECC}) {
- for (int i=0;i<4;i++){
- LWHist::safeDelete(m_partHistos[i].h_NoisyEvent);
+ for (unsigned i=0;i<m_partHistos.size();i++){
+ if(m_partHistos[i].h_NoisyEvent) LWHist::safeDelete(m_partHistos[i].h_NoisyEvent);
m_partHistos[i].h_NoisyEvent = nullptr;
// LWHist::safeDelete(part->h_NoisyWEvent);
@@ -823,3 +824,4 @@ StatusCode LArNoisyROMon::finalize()
return StatusCode::SUCCESS;
}
+
--
GitLab