diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationShiftMapBase.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationShiftMapBase.cxx
index 921757b230177c79d6abfe5f7e212c255dc42446..edb4d2fd2395cfa2973e76930d0e03c5c664badf 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationShiftMapBase.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/MdtCalibrationShiftMapBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// std
@@ -56,7 +56,7 @@ StatusCode MdtCalibrationShiftMapBase::initializeMap() {
StatusCode MdtCalibrationShiftMapBase::dumpMapAsFile() {
/* initialize map if it's not there */
if (!m_mapIsInitialized) {
- initializeMap();
+ ATH_CHECK(initializeMap());
}
/* write the map to a file */
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
index fc9dd1e20f44744a7214cc87c1af28c448cabe98..c5d77fecc60bed36a5699119702ce206441343ab 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -360,7 +360,7 @@ void testit (const RpcPadContainer& trans1, IRPCcablingSvc* cabling)
{
MsgStream log (0, "test");
RpcPadContainerCnv_p1 cnv;
- cnv.initialize (log, cabling);
+ assert(cnv.initialize (log, cabling));
RpcPadContainer_p1 pers;
cnv.transToPers (&trans1, &pers, log);
std::unique_ptr<RpcPadContainer> trans2 (cnv.createTransient (&pers, log));
@@ -404,7 +404,7 @@ void test1 (IRPCcablingSvc* cabling)
pad->push_back (std::move (cm));
}
- trans1.addCollection (pad.release(), k);
+ assert (trans1.addCollection (pad.release(), k).isSuccess());
}
testit (trans1, cabling);
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
index 6a497ae83ff5093cbbeadb95d9ed53c12ad57139..0f6a8da70e2645ff0cd1a76a279a60ac7964f339 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -360,7 +360,7 @@ void testit (const RpcPadContainer& trans1, IRPCcablingSvc* cabling)
{
MsgStream log (0, "test");
RpcPadContainerCnv_p2 cnv;
- cnv.initialize (log, cabling);
+ assert( cnv.initialize (log, cabling).isSuccess() );
RpcPadContainer_p2 pers;
cnv.transToPers (&trans1, &pers, log);
std::unique_ptr<RpcPadContainer> trans2 (cnv.createTransient (&pers, log));
@@ -404,7 +404,7 @@ void test1 (IRPCcablingSvc* cabling)
pad->push_back (std::move (cm));
}
- trans1.addCollection (pad.release(), k);
+ assert (trans1.addCollection (pad.release(), k).isSuccess());
}
testit (trans1, cabling);
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/muIdHelper.icc b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/muIdHelper.icc
index 22255d5f93cba83374cfdeb50d5032d8609100fa..9f1cf520ab650e45544cedbb7fbc2ce403119358 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/muIdHelper.icc
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/muIdHelper.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonIdHelpers/MuonIdHelperSvc.h"
@@ -34,11 +34,11 @@ Muon::MuonIdHelperSvc* muIdHelperSvc()
assert ( sg->record (std::move (tgc_id), "TGCIDHELPER") );
Muon::MuonIdHelperSvc* muIdSvc = new Muon::MuonIdHelperSvc("MuonIdHelperSvc", svcLoc);
- muIdSvc->setProperty("HasSTgc", false);
- muIdSvc->setProperty("HasMM", false);
+ assert ( muIdSvc->setProperty("HasSTgc", false).isSuccess() );
+ assert ( muIdSvc->setProperty("HasMM", false).isSuccess() );
assert ( muIdSvc->initialize().isSuccess() );
ISvcManager* svcmgr = dynamic_cast<ISvcManager*>( svcLoc );
- svcmgr->addService( muIdSvc );
+ assert ( svcmgr->addService( muIdSvc ).isSuccess() );
return muIdSvc;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p1_test.cxx
index 99441d6cce335e4d54b76c73401aea54954c4534..3360b17a42bf7c0225c98927ce611bd73f5efedf 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p1_test.cxx
@@ -126,7 +126,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
Muon::CscTimeEarly);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p2_test.cxx
index 8d7b4aa581d67febd5405709ba411a83aa85119d..bb3788a916b94cbe3d93ebe0af587aeab5d1806b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscPrepDataContainerCnv_p2_test.cxx
@@ -123,7 +123,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
Muon::CscTimeEarly);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscStripPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscStripPrepDataContainerCnv_p1_test.cxx
index ef7e0812cb3a3fe1344a4c1839f6c8fefae8e861..c8616061583e0a44a231189090a18799698c581d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscStripPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscStripPrepDataContainerCnv_p1_test.cxx
@@ -122,7 +122,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
3 + offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MMPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MMPrepDataContainerCnv_p1_test.cxx
index 7b9f9fa829ae92ae8c610fcfcea47e2f03926b79..3dbbe5d65df9a8b70109d07621d565ed70a6d6a6 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MMPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MMPrepDataContainerCnv_p1_test.cxx
@@ -119,7 +119,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
muo_dd.getMMReadoutElement (clusId));
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p1_test.cxx
index b533bf0c6f0698198bce7a4ddd92e954bddaa7d7..77d5f4eb258daf2dba55de69c9b811fe8edc779f 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p1_test.cxx
@@ -105,7 +105,7 @@ void test1 (const MuonGM::MuonDetectorManager& muo_dd)
);
coll->push_back (std::move (dig));
}
- trans1.addCollection (coll.release(), hash);
+ assert(trans1.addCollection (coll.release(), hash));
}
testit (trans1);
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p2_test.cxx
index 1767e05daa8fe963492fb199cdd75c33dfa46181..71104204bbb20612fa9101abda4d892af0b76ba7 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MM_DigitContainerCnv_p2_test.cxx
@@ -101,7 +101,7 @@ void test1 (const MuonGM::MuonDetectorManager& muo_dd)
);
coll->push_back (std::move (dig));
}
- trans1.addCollection (coll.release(), hash);
+ assert(trans1.addCollection (coll.release(), hash));
}
testit (trans1);
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p1_test.cxx
index 7b83ed7fc7cdf4ba843c781e8273003f8c95867c..5c9ad92fd8b0e81ca196fd5ce916d9365ba87794 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p1_test.cxx
@@ -122,7 +122,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
Muon::MdtStatusDriftTime);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p2_test.cxx
index 0f59ec97c6c94c4a11009559af6769ffba5e0d84..5f9f5a96be6845464dc9abceaa48772278926281 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MdtPrepDataContainerCnv_p2_test.cxx
@@ -119,7 +119,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
Muon::MdtStatusDriftTime);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcCoinDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcCoinDataContainerCnv_p1_test.cxx
index 22b585107780da18406ea35a1d6823db4bff2a90..fbb5316f201aab5dacd1fcd42af2db74fd4712c1 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcCoinDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcCoinDataContainerCnv_p1_test.cxx
@@ -151,7 +151,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p1_test.cxx
index 666d787f9d81864b8227cd37c3059cd660b31c63..2817979142049c5e521fabbf06fbb867e376fb19 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p1_test.cxx
@@ -122,7 +122,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
7+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p2_test.cxx
index d2fd0f03ce2f271e1dfdb0184b2f102e4ab4d5db..2cfef9bdd6831b2b6b85301ac977267f8307558c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p2_test.cxx
@@ -122,7 +122,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
7+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p3_test.cxx
index 649c0c617e65b43f3675c25322c9132ffbf177e3..2f7d9d22cfb31d52b095457d4dbca36c374e0f84 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/RpcPrepDataContainerCnv_p3_test.cxx
@@ -119,7 +119,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
7+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_DigitContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_DigitContainerCnv_p1_test.cxx
index a9b9f1c9d051892ddfeec584e3df912ebbd65912..53906d3fd8f361f288bb05ad33071bcbb03669aa 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_DigitContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_DigitContainerCnv_p1_test.cxx
@@ -82,7 +82,7 @@ void test1 (const MuonGM::MuonDetectorManager& muo_dd)
123+offs, 4.5+offs, 6.5+offs, false, false);
coll->push_back (std::move (dig));
}
- trans1.addCollection (coll.release(), hash);
+ assert(trans1.addCollection (coll.release(), hash));
}
testit (trans1);
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_RawDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_RawDataContainerCnv_p1_test.cxx
index 37354acac2974ebcb0a58a15b6223de26311e228..baef6dcc503175a0cd0708a8dab06f5ab160e6af 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_RawDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/STGC_RawDataContainerCnv_p1_test.cxx
@@ -83,7 +83,7 @@ void test1 (const MuonGM::MuonDetectorManager& muo_dd)
( Identifier(0x712a0054) );
coll->push_back (std::move (dig));
}
- trans1.addCollection (coll.release(), hash);
+ assert(trans1.addCollection (coll.release(), hash));
}
testit (trans1, muo_dd);
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p1_test.cxx
index eabfb52c87a3fb5d6762527fbbea7a2b86ba41c0..a8803c28d8c3b21a4cfdbaf3b2b007d526d6661c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p1_test.cxx
@@ -147,7 +147,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p2_test.cxx
index 46864deeab8f158001aab181adecb220f17a48df..89cc595b044092dbadad4a9a2605cfb78b4e2bd2 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p2_test.cxx
@@ -147,7 +147,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p3_test.cxx
index 062be0e558a52f0923ff5dba71caee88f7c0e374..d77f758e23af462dde09b8260ec4b4f187c02b93 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcCoinDataContainerCnv_p3_test.cxx
@@ -147,7 +147,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p1_test.cxx
index ed39b09be585527e6e54522c3daa55aac7b67935..f2216db995118ef9ee9fd61e20ddbb8f8ef93817 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p1_test.cxx
@@ -118,7 +118,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
123+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p2_test.cxx
index 1b4b5d306ea02d29ddbf2b326c4f63b76ce0f7cd..d7269dadf66e448103906dccb8c61dc229ad6534 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p2_test.cxx
@@ -115,7 +115,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
123+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p3_test.cxx
index af137c653fc4a46b8b19b6fec2f3aca714818419..f472dfdfa260a5b5b4fba64a7964176e97166867 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/TgcPrepDataContainerCnv_p3_test.cxx
@@ -115,7 +115,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
123+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc
index 96f6540559eb978516f6ffd84ef23d8ee1c3a484..644ac83701a0d46acb55bf6f8a53c2887345edef 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc
@@ -277,7 +277,7 @@ MuonGM::MuonDetectorManager& init_cs (GeoFullPhysVol& pvol)
EventIDBase::UNDEFNUM,
EventIDBase::UNDEFNUM,
100000));
- cc->insert (range, std::move (muo_dd));
+ assert (cc->insert (range, std::move (muo_dd)));
assert (condStore->record (std::move (cc), "MuonDetectorManager"));
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/sTgcPrepDataContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/sTgcPrepDataContainerCnv_p1_test.cxx
index effaea4bb79793679635301311f37e86dd84dc0b..ae51726f6aafbf5eaced53dff0339f61f517176b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/sTgcPrepDataContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/sTgcPrepDataContainerCnv_p1_test.cxx
@@ -115,7 +115,7 @@ makeclusts (const MuonGM::MuonDetectorManager& muo_dd)
123+offs);
coll->push_back (std::move (cl));
}
- cont->addCollection (coll.release(), hash);
+ assert(cont->addCollection (coll.release(), hash));
}
return cont;
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRODReadOut.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRODReadOut.cxx
index 7e360729766b39d74a9d7a3333703ae44c850d70..68b44129c85f2b2014638b2d609c79a1584c25c8 100755
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRODReadOut.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRODReadOut.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtRODReadOut.h"
@@ -34,7 +34,7 @@ void MdtRODReadOut::decodeHeader(const std::vector<uint32_t>& p)
#ifndef NDEBUG
IMessageSvc* msgSvc = 0;
ISvcLocator* svcLocator = Gaudi::svcLocator();
- svcLocator->service("MessageSvc", msgSvc);
+ svcLocator->service("MessageSvc", msgSvc).ignore();
MsgStream log(msgSvc, "MdtRODReadOut::decodeHeader");
#endif
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.h
index a968d831574eeac87bc6e32a30f00a0c35bde455..531a93d6d3e3a9e007852702e28178d92a9df78c 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.h
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.h
@@ -519,7 +519,7 @@ namespace Muon
case 0: cnv_sc = fillCollection_v240(data,robFrag.rod_ndata(),*coll); break;
case 1: cnv_sc = fillCollection_v300(data,robFrag.rod_ndata(),*coll,subDetector, RPC_SECTORLOGIC); break;
case 2: cnv_sc = fillCollection_v302(data,robFrag.rod_ndata(),*coll,sourceId, RPC_SECTORLOGIC); break;
- default: fillCollection_v240(data,robFrag.rod_ndata(),*coll); break;
+ default: cnv_sc = fillCollection_v240(data,robFrag.rod_ndata(),*coll); break;
}
if( cnv_sc.isFailure() )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/TGCCablingDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/TGCCablingDbTool.cxx
index 125d8446612e5260b5ce96c5b40cdfce4276329e..d611b9a0ec4f098dd64e2e0700350757fa572083 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/TGCCablingDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/TGCCablingDbTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TGC_CondCabling/TGCCablingDbTool.h"
@@ -111,17 +111,17 @@ std::vector<std::string>* TGCCablingDbTool::giveASD2PP_DIFF_12() {
StatusCode TGCCablingDbTool::loadParameters(IOVSVC_CALLBACK_ARGS_P(I, keys)) {
ATH_MSG_INFO("loadParameters from DB");
+ StatusCode sc;
std::list<std::string>::const_iterator itr = keys.begin();
std::list<std::string>::const_iterator itr_e = keys.end();
-
for(; itr!=itr_e; ++itr) {
ATH_MSG_INFO("loadParameters " << (*itr) << " I=" << I << " ");
if((*itr)==m_Folder) {
- loadASD2PP_DIFF_12(I, keys);
+ sc &= loadASD2PP_DIFF_12(I, keys);
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode TGCCablingDbTool::loadASD2PP_DIFF_12(IOVSVC_CALLBACK_ARGS_P(/*I*/, /*keys*/)) {
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscReadWriteCoolStr.icc b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscReadWriteCoolStr.icc
index 8b97b634b394a23ec104a9395fc569f02c3b0079..dd8bcf05a1dcf7439477069c35daf9e6cb609ef7 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscReadWriteCoolStr.icc
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/CscReadWriteCoolStr.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -285,7 +285,7 @@ namespace MuonCalib {
refDatum = 0;
}
data_type newDatum(0);
- mergeBits(datum,refDatum,newDatum,nBits, shiftBits);
+ CHECK(mergeBits(datum,refDatum,newDatum,nBits, shiftBits));
datum = newDatum;
}
@@ -359,7 +359,7 @@ namespace MuonCalib {
refDatum = 0;
}
data_type newDatum(0);
- mergeBits(datum,refDatum,newDatum,nBits, shiftBits);
+ CHECK(mergeBits(datum,refDatum,newDatum,nBits, shiftBits));
datum = newDatum;
}
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx
index 74a3bc6bb7b30581d3214d318cc1b971c2250e95..0a00b460ee064357f99078fa63ae3d820c12e432 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************************8
@@ -403,7 +403,7 @@ namespace MuonCalib {
//Precaching. We shouldn't need to do this, but some rare cases it seems the callbacks are not called in time for the begining of the run.
if(m_preCache)
- cacheParameter(sgKey);
+ cacheParameter(sgKey).ignore();
// anySucceed = true;
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx
index 9eace74305d9d0e04f9dbde8e1bfb0fa7dfa3b0c..862493f8d98cdca3ab1d334db22d509aeb0ad25b 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MdtCoolStrSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/MsgStream.h"
@@ -131,7 +131,7 @@ StatusCode MdtCoolStrSvc::putFileT0(const std::string& folder,
int size_fin = sdata_t0.size();
std::cout << "size of fin " << size_fin << std::endl;
- putData(folder,filename,chan,tech,sdata_t0 );
+ ATH_CHECK(putData(folder,filename,chan,tech,sdata_t0 ));
} else {
log << MSG::INFO << "Cannot open file " << filename << endmsg;
return StatusCode::FAILURE;
@@ -241,7 +241,7 @@ StatusCode MdtCoolStrSvc::putFileRT(const std::string& folder,
int size_fin2 = sdata_rt.size();
std::cout << "size of fin " << size_fin2 << std::endl;
- putData(folder,filename,chan,tech,sdata_rt );
+ ATH_CHECK(putData(folder,filename,chan,tech,sdata_rt ));
//} else {
//log << MSG::INFO << "Cannot open file " << filename << endmsg;
//return StatusCode::FAILURE;
@@ -330,7 +330,7 @@ StatusCode MdtCoolStrSvc::putFileAlignCorr(const std::string& folder,
f.close();
//return StatusCode::SUCCESS;
- putData(folder,filename,chan,tech,sdata );
+ ATH_CHECK(putData(folder,filename,chan,tech,sdata ));
} else {
log << MSG::INFO << "Cannot open file " << filename << endmsg;
return StatusCode::FAILURE;
@@ -392,7 +392,7 @@ StatusCode MdtCoolStrSvc::putAligFromFile(const std::string& folder,
std::cout<< sdata<< std::endl;
fclose (f);
- putData(folder,filename,chan,tech,sdata );
+ ATH_CHECK(putData(folder,filename,chan,tech,sdata ));
} else {
fclose (f);
log << MSG::INFO << "Cannot open file or empty" << filename << endmsg;
@@ -486,7 +486,7 @@ StatusCode MdtCoolStrSvc::putFileTube(const std::string& folder,
sdata += " end";
fclose (f);
- putData(folder,filename,chan,tech,sdata );
+ ATH_CHECK(putData(folder,filename,chan,tech,sdata ));
} else {
fclose (f);
log << MSG::INFO << "Cannot open file or emtpy" << filename << endmsg;
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MDT_MapConversion.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MDT_MapConversion.cxx
index 3ded344da0d0c50c2d8f0909592de0b3189186b1..f7c2db3054337a33c995ce2773e4ec2a338b135c 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MDT_MapConversion.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MDT_MapConversion.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/MsgStream.h"
@@ -81,7 +81,7 @@ StatusCode MDT_MapConversion::initialize()
IGeoModelSvc *geoModel;
- service ("GeoModelSvc",geoModel);
+ ATH_CHECK(service ("GeoModelSvc",geoModel));
std::string AtlasVersion = geoModel->atlasVersion();
std::string MuonVersion = geoModel->muonVersionOverride();
@@ -90,7 +90,7 @@ StatusCode MDT_MapConversion::initialize()
IRDBAccessSvc *accessSvc;
- service("RDBAccessSvc",accessSvc);
+ ATH_CHECK(service("RDBAccessSvc",accessSvc));
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx
index bd80afb5faf23ced934c29efb49fa7e9ec320803..08b0f9df6ee95027e60355ad7e7847fa6c006611 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonDetectorStatusDbTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "SGTools/TransientAddress.h"
@@ -90,20 +90,18 @@ StatusCode MuonDetectorStatusDbTool::initialize()
StatusCode MuonDetectorStatusDbTool::loadParameterStatus(IOVSVC_CALLBACK_ARGS_P(I,keys)){
ATH_MSG_INFO( "LoadParameters has been triggered for the following keys " );
-
+
+ StatusCode sc;
std::list<std::string>::const_iterator itr;
for (itr=keys.begin(); itr!=keys.end(); ++itr) {
msg(MSG::INFO) << *itr << " I="<<I<<" ";
if(*itr==m_tubeFolder) {
- loadTubeStatus(I,keys);
-
+ sc &= loadTubeStatus(I,keys);
}
-
-
}
msg() << endmsg;
- return StatusCode::SUCCESS;
+ return sc;
}
@@ -124,7 +122,7 @@ StatusCode MuonDetectorStatusDbTool::loadTubeStatus(IOVSVC_CALLBACK_ARGS_P(I,key
StatusCode sc = detStore()->retrieve( m_chamberStatusData, m_tubeStatusDataLocation );
if(sc.isSuccess()) {
ATH_MSG_DEBUG( "ChamberStatus Map found " << m_chamberStatusData );
- detStore()->remove( m_chamberStatusData );
+ ATH_CHECK( detStore()->remove( m_chamberStatusData ) );
ATH_MSG_DEBUG( "TubeStatuse Collection at " << m_chamberStatusData << " removed ");
}
@@ -236,13 +234,13 @@ StatusCode MuonDetectorStatusDbTool::loadTubeStatus(IOVSVC_CALLBACK_ARGS_P(I,key
<< atrc->clID() );
IOVRange range;
- m_IOVSvc->getRange(1238547719, m_tubeFolder, range);
+ ATH_CHECK(m_IOVSvc->getRange(1238547719, m_tubeFolder, range));
ATH_MSG_DEBUG("CondAttrListCollection IOVRange "<<range);
IOVRange range2;
- m_IOVSvc->setRange(228145, m_tubeStatusDataLocation, range);
- m_IOVSvc->getRange(228145, m_tubeStatusDataLocation, range2);
+ ATH_CHECK(m_IOVSvc->setRange(228145, m_tubeStatusDataLocation, range));
+ ATH_CHECK(m_IOVSvc->getRange(228145, m_tubeStatusDataLocation, range2));
ATH_MSG_DEBUG("TubeStatusContainer new IOVRange "<<range2);
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx
index 6c7932f0e3b9641b278c1d25f3320fa72986f379..168de59bec0db170a3c8b332b73c3e673e26f9cf 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/RpcDetectorStatusDbTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/MsgStream.h"
@@ -103,20 +103,14 @@ StatusCode RpcDetectorStatusDbTool::initialize()
StatusCode RpcDetectorStatusDbTool::loadParameterStatus(IOVSVC_CALLBACK_ARGS_P(I,keys)){
- StatusCode sc=StatusCode::SUCCESS;
+ StatusCode sc;
std::list<std::string>::const_iterator itr;
-
for (itr=keys.begin(); itr!=keys.end(); ++itr) {
-
m_log << MSG::INFO << *itr << " I="<<I<<" ";
-
-
if(*itr==m_FolderName) {
- loadRpcDqStatus(I,keys);
-
+ sc &= loadRpcDqStatus(I,keys);
}
-
}
return sc;
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx
index 30dcbbc36c4caf47986ffa61d8e890ee51ebbdfb..10db0777f13ebe324538ed06ba12ed594556b901 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonGeoModel/MuonDetectorTool.h"
@@ -231,7 +231,7 @@ MuonDetectorTool::createFactory(MuonDetectorFactory001& theFactory)
// Get the detector configuration.
IGeoModelSvc *geoModel;
- service ("GeoModelSvc",geoModel);
+ ATH_CHECK(service ("GeoModelSvc",geoModel));
std::string AtlasVersion = geoModel->atlasVersion();
std::string MuonVersion = geoModel->muonVersionOverride();
@@ -253,7 +253,7 @@ MuonDetectorTool::createFactory(MuonDetectorFactory001& theFactory)
{
ATH_MSG_DEBUG("Detector Information coming from the database (job options IGNORED)" );
IRDBAccessSvc *accessSvc;
- service("RDBAccessSvc",accessSvc);
+ ATH_CHECK(service("RDBAccessSvc",accessSvc));
IRDBRecordset_ptr switchSet = accessSvc->getRecordsetPtr("MuonSwitches", detectorKey, detectorNode);
if ((*switchSet).size()==0) return StatusCode::FAILURE;
const IRDBRecord *switches = (*switchSet)[0];
@@ -335,7 +335,7 @@ MuonDetectorTool::createFactory(MuonDetectorFactory001& theFactory)
if ( 0 == m_detector ) {
IRDBAccessSvc* access = 0;
- service("RDBAccessSvc",access);
+ ATH_CHECK(service("RDBAccessSvc",access));
// MuonDetectorFactory001 theFactory(detStore().operator->());
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx
index 0d4cea801ce6c4c4858fb6e6c2a190aa432c425a..5f6e30d7e48beaedb33bdb994200a6105ad19436 100644
--- a/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonGeoModelTest/MuonHitRelocation.h"
@@ -243,7 +243,7 @@ StatusCode MuonHitRelocation::execute() {
<<" ml/l/t "<<m_c->mlayer<<"/"<<m_c->layer<<"/"<<m_c->tube );
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
}
}
}
@@ -305,7 +305,7 @@ StatusCode MuonHitRelocation::execute() {
<<" layer "<<m_c->layer );
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
}
}
}
@@ -365,7 +365,7 @@ StatusCode MuonHitRelocation::execute() {
<<" dbR/dbZ/dbP "<<m_c->dbr<<"/"<<m_c->dbz<<"/"<<m_c->dbphi<<" gg "<<m_c->layer );
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
}
}
}
@@ -424,7 +424,7 @@ StatusCode MuonHitRelocation::execute() {
<<" clay/lay "<<m_c->mlayer<<"/"<<m_c->layer );
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
}
}
}
@@ -495,7 +495,7 @@ StatusCode MuonHitRelocation::execute() {
<<" layer "<<m_c->layer );
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
}
}
}
@@ -569,7 +569,7 @@ StatusCode MuonHitRelocation::execute() {
<<" layer "<<m_c->layer );
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
}
}
}
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/RPC_SimHitToPrdCBNTAlgo.cxx b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/RPC_SimHitToPrdCBNTAlgo.cxx
index 586be0a6b48c21df44081fc0a997700322ad6dd6..16e9171e7455bf153af39eb419308990da7e0d2c 100755
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/RPC_SimHitToPrdCBNTAlgo.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/RPC_SimHitToPrdCBNTAlgo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonSimHitToPrdTest/RPC_SimHitToPrdCBNTAlgo.h"
@@ -442,7 +442,7 @@ StatusCode RPC_SimHitToPrdCBNTAlgo::execute()
}
}
- ntupleSvc()->writeRecord(m_c->nt);
+ ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
return StatusCode::SUCCESS;
}