Merge branch 'cherry-pick-4511b2b485-master' into 'master'

Merge branch '21.0-fix-AODThinning' into '21.0'

See merge request !2847

PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx

@@ -100,7 +100,7 @@ StatusCode ThinNegativeEnergyCaloClustersAlg::execute()
     // Increase the event counter
     ++m_nEventsProcessed;
     
-    // Is truth thinning required?
+    // Is thinning required?
     if (!m_doThinning) {
         return StatusCode::SUCCESS;
     } 
@@ -110,8 +110,9 @@ StatusCode ThinNegativeEnergyCaloClustersAlg::execute()
     if (evtStore()->contains<xAOD::CaloClusterContainer>(m_caloClustersKey)) {
         CHECK( evtStore()->retrieve( caloClusters , m_caloClustersKey ) );
     } else {
-        ATH_MSG_FATAL("No CaloClusterContainer with key "+m_caloClustersKey+" found.");
-        return StatusCode::FAILURE;
+        ATH_MSG_INFO("No CaloClusterContainer with key "+m_caloClustersKey+" found. Thinning cannot be applied for this container");
+        m_doThinning = false;
+        return StatusCode::SUCCESS;
     }
 
     // Set up masks

PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx

@@ -111,8 +111,9 @@ StatusCode ThinNegativeEnergyNeutralPFOsAlg::execute()
     if (evtStore()->contains<xAOD::PFOContainer>(m_neutralPFOsKey)) {
         CHECK( evtStore()->retrieve( neutralPFOs , m_neutralPFOsKey ) );
     } else {
-        ATH_MSG_FATAL("No PFOContainer with key "+m_neutralPFOsKey+" found.");
-        return StatusCode::FAILURE;
+        ATH_MSG_INFO("No PFOContainer with key "+m_neutralPFOsKey+" found. Thinning cannot be applied to this container");
+        m_doThinning = false;
+        return StatusCode::SUCCESS;
     }
 
     // Set up masks