Merge branch 'ATLJETMET-895_20180126_1' into 'master'

Change CHECK() to sc.isFailure() call as stop-gap solution for ATLJETMET-895

See merge request atlas/athena!8359

Reconstruction/Jet/JetRecCalo/src/MissingCellListTool.cxx

@@ -151,7 +151,12 @@ int MissingCellListTool::execute() const {
   if(m_addBadCells) {
     // (In run1 this part possibly added several times the same cell in the geometric map)
     const CaloCellContainer * cells;
-    CHECK(evtStore()->retrieve(cells, "AllCalo"));
+    StatusCode sc = evtStore()->retrieve(cells, "AllCalo");
+    if ( sc.isFailure() ) {
+      ATH_MSG_ERROR("Unable to retrieve CaloCellContainer AllCalo from event store.");
+      return 1;
+    }
+ 
     CaloCellContainer::const_iterator it= cells->begin();
     CaloCellContainer::const_iterator itE= cells->end();
     for(; it!=itE; ++it){
@@ -200,7 +205,12 @@ int MissingCellListTool::execute() const {
   ATH_MSG( DEBUG ) << " total bad and missing "<< badandmissingCells.size() << "  "<< badandmissingCellsGeomMap->size() << endmsg; 
   
 
-  CHECK( evtStore()->record(badandmissingCellsGeomMap, m_missingCellMapName) );
+  StatusCode sc = evtStore()->record(badandmissingCellsGeomMap, m_missingCellMapName) ;
+  if ( sc.isFailure() ) {
+    ATH_MSG_ERROR("Unable to record badandmissingCellsGeomMap in event store: " << m_missingCellMapName);
+   return 1;
+  }
+
   //  m_needSetup = false;
   return 0;
 }

Reconstruction/Jet/JetSubStructureMomentTools/Root/BoostedXbbTagTool.cxx

@@ -32,8 +32,12 @@ int BoostedXbbTagTool::modifyJet(xAOD::Jet &jet) const
   static JetSubStructureUtils::BoostedXbbTag tagger(m_working_point, m_recommendations_file, m_boson_type, m_algorithm_name, m_num_bTags, m_decor_prefix, m_debug, m_verbose);
 
   const xAOD::MuonContainer *muons = 0;
-  ASG_CHECK(evtStore()->retrieve(muons, m_muon_container_name));
-
+  StatusCode sc = evtStore()->retrieve(muons, m_muon_container_name);
+  if ( sc.isFailure() ) {
+    ATH_MSG_ERROR("Unable to retrieve MuonContainer from event store: " << m_muon_container_name);
+    return 1;
+  }
+ 
   jet.setAttribute("BoostedXbbTag", static_cast<int>(tagger.result(jet, muons)));
 
   return 0;