From ad5a59335ba77c9f2e5593684ea16f6f8098a9a9 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Thu, 14 Sep 2017 11:17:20 +0000
Subject: [PATCH] Merge branch 'checks_in_EDTool' into '21.0'

Do not fail when an EventShapeDensity object pre-exists in evt store. ATLASRECTS-3508

See merge request !4517
---
 .../EventShapes/EventShapeTools/Root/EventDensityTool.cxx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Reconstruction/EventShapes/EventShapeTools/Root/EventDensityTool.cxx b/Reconstruction/EventShapes/EventShapeTools/Root/EventDensityTool.cxx
index 333610b0848..b70772116e0 100644
--- a/Reconstruction/EventShapes/EventShapeTools/Root/EventDensityTool.cxx
+++ b/Reconstruction/EventShapes/EventShapeTools/Root/EventDensityTool.cxx
@@ -111,8 +111,8 @@ StatusCode EventDensityTool::fillEventShape() const {
   ATH_MSG_DEBUG("Begin fillEventShape()");
 
   if ( evtStore()->contains<xAOD::EventShape>(m_outcon) ){
-    ATH_MSG_ERROR( "EventShape with key "<< m_outcon << " already exists. " );
-    return StatusCode::FAILURE;      
+    ATH_MSG_WARNING( "EventShape with key "<< m_outcon << " already exists. Not overwriting it." );
+    return StatusCode::SUCCESS;      
   }
 
   xAOD::EventShape *pevs = new xAOD::EventShape();
-- 
GitLab