Commit 1db56b6b authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (MuonRegionSelector-01-00-09)

	* MuonRegionSelector-01-00-09
	* Coverity fixes 11208, 11216, 11222, 11224, 29231, 29236
parent e463c797
################################################################################
# Package: MuonRegionSelector
################################################################################
# Declare the package name:
atlas_subdir( MuonRegionSelector )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
DetectorDescription/GeoPrimitives
DetectorDescription/RegSelLUT
GaudiKernel
PRIVATE
DetectorDescription/Identifier
MuonSpectrometer/MuonCablings/CSCcabling
MuonSpectrometer/MuonCablings/MuonMDT_Cabling
MuonSpectrometer/MuonCablings/MuonTGC_Cabling
MuonSpectrometer/MuonCablings/RPCcablingInterface
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry )
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
# Component(s) in the package:
atlas_add_component( MuonRegionSelector
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives RegSelLUT GaudiKernel Identifier CSCcablingLib MuonMDT_CablingLib MuonTGC_CablingLib RPCcablingInterfaceLib MuonReadoutGeometry )
# Install files from the package:
atlas_install_headers( MuonRegionSelector )
atlas_install_joboptions( share/*.py )
......@@ -111,8 +111,10 @@ StatusCode CSC_RegionSelectorTable::createTable() {
p_IdHelper->get_hash(Id, Idhash, &ModuleContext);
ExpandedIdentifier exp_id;
p_IdHelper->get_expanded_id( Id, exp_id, &ModuleContext);
if (p_IdHelper->get_expanded_id( Id, exp_id, &ModuleContext)) {
ATH_MSG_DEBUG("Failed retrieving ExpandedIdentifier for PRD Identifier = " << Id.getString() << ". Skipping to the next PRD.");
continue;
}
int detid = ( exp_id[2]<0 ? -1 : 1 );
int layerid = exp_id[1]+1;
......
......@@ -105,8 +105,10 @@ StatusCode MDT_RegionSelectorTable::createTable() {
p_IdHelper->get_hash(Id, Idhash, &ModuleContext);
ExpandedIdentifier exp_id;
p_IdHelper->get_expanded_id( Id, exp_id, &ModuleContext);
if (p_IdHelper->get_expanded_id( Id, exp_id, &ModuleContext)) {
ATH_MSG_DEBUG("Failed retrieving ExpandedIdentifier for PRD Identifier = " << Id.getString() << ". Skipping to the next PRD.");
continue;
}
int detid = ( exp_id[2]<0 ? -1 : 1 );
int layerid = exp_id[1]+1;
......
......@@ -59,7 +59,15 @@ StatusCode RPC_RegionSelectorTable::initialize() {
//get RPC CablingSvc from the server
CHECK( RpcCabGet->giveCabling(m_rpcCabling) );
ATH_MSG_VERBOSE("RPC CablingSvc obtained: " << (dynamic_cast<const Service*>(m_rpcCabling))->name());
if (msgLvl(MSG::VERBOSE)) {
const Service* castedRpcCabling = dynamic_cast<const Service*>(m_rpcCabling);
if (castedRpcCabling)
ATH_MSG_VERBOSE("RPC CablingSvc obtained: " << castedRpcCabling->name());
else {
ATH_MSG_ERROR("Failed dynamic casting of m_rpcCabling to (const Service*)");
return StatusCode::FAILURE;
}
}
return createTable();
}
......@@ -105,7 +113,12 @@ StatusCode RPC_RegionSelectorTable::createTable() {
}
std::vector<uint32_t> robIds;
CHECK( m_rpcCabling->giveROB_fromPRD(prdHashId, robIds) );
StatusCode sc = m_rpcCabling->giveROB_fromPRD(prdHashId, robIds);
if ( !sc.isSuccess() ) {
REPORT_ERROR(sc);
delete rpclut;
return sc;
};
if (robIds.size() < 1) {
ATH_MSG_DEBUG("There is no ROB associated with the PRD HashId = " << (unsigned int)prdHashId << ". Skipping to the next PRD.");
......@@ -117,8 +130,10 @@ StatusCode RPC_RegionSelectorTable::createTable() {
}
ExpandedIdentifier exp_id;
//int expid =
p_IdHelper->get_expanded_id( prdId, exp_id, &ModuleContext);
if (p_IdHelper->get_expanded_id( prdId, exp_id, &ModuleContext)) {
ATH_MSG_DEBUG("Failed retrieving ExpandedIdentifier for PRD Identifier = " << prdId.getString() << ". Skipping to the next PRD.");
continue;
}
int detid = ( exp_id[2]<0 ? -1 : 1 );
int layerid = exp_id[1];
......
......@@ -125,8 +125,10 @@ StatusCode TGC_RegionSelectorTable::createTable() {
p_IdHelper->get_hash( Id,hashId,&ModuleContext);
ExpandedIdentifier exp_id;
p_IdHelper->get_expanded_id( Id, exp_id, &ModuleContext);
if (p_IdHelper->get_expanded_id( Id, exp_id, &ModuleContext)) {
ATH_MSG_DEBUG("Failed retrieving ExpandedIdentifier for PRD Identifier = " << Id.getString() << ". Skipping to the next PRD.");
continue;
}
int detid = ( exp_id[2]<0 ? -1 : 1 );
int layerid = exp_id[1]+1;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment