diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/CscPrepDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/CscPrepDataRetriever.cxx index 92d12ad8d84a06596f09f95ea19eaf3c407f9a35..ee2283274c7ee25375216ee373f620beed81baa3 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/CscPrepDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/CscPrepDataRetriever.cxx @@ -38,7 +38,11 @@ namespace JiveXML { ATH_MSG_VERBOSE("Retrieving " << dataTypeName()); SG::ReadHandle<Muon::CscPrepDataContainer> cscContainer(m_sgKey); - + + if (!cscContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } int ndata = 0; Muon::CscPrepDataContainer::const_iterator containerIt; diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MMPrepDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MMPrepDataRetriever.cxx index 859ba5b11557aa2e82ef2e2ed38efdc029b7fcb4..42cded98c1942397b5bb3d6e49bb39f7c820a10b 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MMPrepDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MMPrepDataRetriever.cxx @@ -46,6 +46,11 @@ namespace JiveXML { SG::ReadHandle<Muon::MMPrepDataContainer> mmContainer(m_sgKey); + if (!mmContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } + int ndata = 0; for (const auto mmCollection : *mmContainer){ ndata += mmCollection->size(); diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MdtPrepDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MdtPrepDataRetriever.cxx index 767d3e6fb9daf48f79e38e44e2e13ce9c22d6b87..f9f1fade1240e53d0cab0fb8c38657483e479a60 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MdtPrepDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/MdtPrepDataRetriever.cxx @@ -40,7 +40,10 @@ namespace JiveXML { ATH_MSG_VERBOSE("Retrieving " << dataTypeName()); SG::ReadHandle<Muon::MdtPrepDataContainer> mdtContainer(m_sgKey); - + if (!mdtContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } int ndata = 0; Muon::MdtPrepDataContainer::const_iterator containerIt; diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/RpcPrepDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/RpcPrepDataRetriever.cxx index 0d6247a68199dbf4144dcd4879f1c98b648a2c8a..e07dc10a5ecad8a54e5c96a6946b827f725639ef 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/RpcPrepDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/RpcPrepDataRetriever.cxx @@ -40,6 +40,11 @@ namespace JiveXML { SG::ReadHandle<Muon::RpcPrepDataContainer> rpcContainer(m_sgKey); + if (!rpcContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } + int ndata = 0; Muon::RpcPrepDataContainer::const_iterator containerIt; for (containerIt=rpcContainer->begin(); containerIt!=rpcContainer->end(); ++containerIt) { diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TgcPrepDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TgcPrepDataRetriever.cxx index eeba935c39fa9647f64f01304550418ea0dee695..ed3cb6279c87456dfb5495f55ebbba74ecf29fef 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TgcPrepDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TgcPrepDataRetriever.cxx @@ -38,6 +38,11 @@ namespace JiveXML { SG::ReadHandle<Muon::TgcPrepDataContainer> tgcContainer(m_sgKey); + if (!tgcContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } + int ndata = 0; Muon::TgcPrepDataContainer::const_iterator containerIt; for (containerIt=tgcContainer->begin(); containerIt!=tgcContainer->end(); ++containerIt) { diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigMuonROIRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigMuonROIRetriever.cxx index 75038032d627d8e5fc5042fec448ecc375e47637..798d0bff9870a435cc776deeb89f34ae86257735 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigMuonROIRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigMuonROIRetriever.cxx @@ -28,7 +28,11 @@ namespace JiveXML { if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() << endmsg; SG::ReadHandle<LVL1_ROI> roi(m_sgKey); - + + if (!roi.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } int nRoIs = roi->getMuonROIs().size(); DataVect phi; phi.reserve(nRoIs); diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigRpcDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigRpcDataRetriever.cxx index 0d13e22735b7c7717cf1354476f59169666e81a1..2afc916114c8519811c9997d1db2199fca16e16f 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigRpcDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/TrigRpcDataRetriever.cxx @@ -42,6 +42,11 @@ namespace JiveXML { // retrieve the collection of RDO SG::ReadHandle<RpcPadContainer> rdoContainer(m_sgKey); + if (!rdoContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } + int ndata=0; for (auto containerIt=rdoContainer->begin(); containerIt!=rdoContainer->end(); ++containerIt) { ndata += (*containerIt)->size(); diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/sTgcPrepDataRetriever.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/sTgcPrepDataRetriever.cxx index 6aae6cca1dace1c566b54737423587357b6c0c93..89a2efe02d8ea329c84047d70b8e62c53245aeaa 100644 --- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/sTgcPrepDataRetriever.cxx +++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/sTgcPrepDataRetriever.cxx @@ -45,6 +45,11 @@ namespace JiveXML { SG::ReadHandle<Muon::sTgcPrepDataContainer> stgcContainer(m_sgKey); + if (!stgcContainer.isValid()) { + ATH_MSG_WARNING("Unable to retrieve: " << m_sgKey); + return(StatusCode::SUCCESS); + } + int ndata = 0; for (const auto stgcCollection : *stgcContainer){ ndata += stgcCollection->size();