Commit 926e2068 authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

addressing coverity defects (MuidCaloScatteringTools-00-07-08)

	* addressing coverity defects 108742, 108743
	* MuidCaloScatteringTools-00-07-08
	* endreq -> endmsg
	* MuidCaloScatteringTools-00-07-07
parent a1ec464b
......@@ -44,6 +44,7 @@ MuidCaloMaterialParam::MuidCaloMaterialParam (const std::string& type,
: AthAlgTool (type, name, parent),
m_surfaceDisplayTool ("Trk::TrackingVolumeDisplayer/TrackingVolumeDisplayer"),
m_produceSurfacesDisplay (false),
m_binSize (1),
m_numberBins (277)
{
declareInterface<IMuidCaloMaterialParam>(this);
......@@ -344,7 +345,7 @@ MuidCaloMaterialParam::defineCaloMaterial (void)
double etaBin = m_binSize*(static_cast<double>(i) + 0.5);
if (std::abs(eta[i] - etaBin) < 0.001*m_binSize) continue;
ATH_MSG_ERROR( " have " << m_numberBins << " eta bins of width " << m_binSize
<< endreq << " for bin " << i << ": expected/found eta "
<< endmsg << " for bin " << i << ": expected/found eta "
<< etaBin << "/" << eta[i]
);
......@@ -436,7 +437,7 @@ MuidCaloMaterialParam::defineCaloMaterial (void)
const Trk::Surface* surfM = innerSurface(-eta[i]);
if (std::abs(surfM->center().z() + innerZ[i]) > 0.001)
{
ATH_MSG_ERROR( " wrong surface " << i << " at eta " << eta[i] << endreq
ATH_MSG_ERROR( " wrong surface " << i << " at eta " << eta[i] << endmsg
<< ": expected/found z " << -innerZ[i] << "/" << surfM->center().z()
);
return StatusCode::FAILURE;
......@@ -444,7 +445,7 @@ MuidCaloMaterialParam::defineCaloMaterial (void)
const Trk::Surface* surfP = innerSurface(eta[i]);
if (std::abs(surfP->center().z() - innerZ[i]) > 0.001)
{
ATH_MSG_ERROR( " wrong surface " << i << " at eta " << eta[i] << endreq
ATH_MSG_ERROR( " wrong surface " << i << " at eta " << eta[i] << endmsg
<< ": expected/found z " << innerZ[i] << "/" << surfP->center().z()
);
return StatusCode::FAILURE;
......
......@@ -40,13 +40,15 @@ namespace Rec
{
MuidCaloTrackStateOnSurface::MuidCaloTrackStateOnSurface (const std::string& type,
const std::string& name,
const std::string& name,
const IInterface* parent)
: AthAlgTool (type, name, parent),
m_caloEnergyDeposit ("Rec::MuidCaloEnergyTool/MuidCaloEnergyTool"),
m_caloEnergyParam ("Rec::MuidCaloEnergyTool/MuidCaloEnergyToolParam"),
m_caloMaterialParam ("Rec::MuidCaloMaterialParam/MuidCaloMaterialParam"),
m_magFieldProperties (0),
m_magFieldSvcHandle ("MagField::AtlasFieldSvc/AtlasFieldSvc", name),
m_magFieldSvc (0),
m_propagator ("Trk::IntersectorWrapper/IntersectorWrapper"),
m_minCaloRadius (0.4*Gaudi::Units::meter),
m_minRemainingEnergy (0.5*Gaudi::Units::GeV),
......@@ -135,13 +137,13 @@ StatusCode
MuidCaloTrackStateOnSurface::finalize()
{
ATH_MSG_INFO( "finalized with "
<< m_count << " muons asking for calo association, out of which: " << endreq
<< m_count << " muons asking for calo association, out of which: " << endmsg
<< " " << m_countInnerFailure
<< " failed to find the inner calo scattering plane," << endreq
<< " failed to find the inner calo scattering plane," << endmsg
<< " " << m_countOuterFailure
<< " failed to find the outer calo scattering plane," << endreq
<< " failed to find the outer calo scattering plane," << endmsg
<< " while another " << m_countCompleteFailure
<< " completely failed to intersect the calorimeter." << endreq
<< " completely failed to intersect the calorimeter." << endmsg
<< " " << m_countArbitrarySolution
<< " with oscillation resolved by taking an arbitrary solution");
......
......@@ -112,7 +112,7 @@ Rec::MuidMaterialEffectsOnTrackProvider::extrapolationSurfacesAndEffects (
energy.first=-3000;
energy.second=500; // ???
// log << MSG::DEBUG << " returning " << matLayers->size() << " materialLayers " << endreq;
// log << MSG::DEBUG << " returning " << matLayers->size() << " materialLayers " << endmsg;
ATH_MSG_DEBUG( "first x0: " << X0inner << " second x0: " << X0outer << " eloss: " << energy.first << " sigma: " << energy.second );
Trk::MaterialProperties matprop(X0outer,1.,0.,0.,0.,0.);
......
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