diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/TRT_TrackTimingTool.cxx b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/TRT_TrackTimingTool.cxx
index bcef3f7c4e56fc5ce5c3001faca30b9f48c40f71..73a81ace88ed00fb3a9368d2ea1a23c77860c270 100644
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/TRT_TrackTimingTool.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/TRT_TrackTimingTool.cxx
@@ -73,7 +73,10 @@ std::vector<Trk::SpaceTimePoint*> InDet::TRT_TrackTimingTool::timeMeasurements(c
std::vector<Trk::SpaceTimePoint*> timeMeasurementsVector;
// need to use constructor: SpaceTimePoint(const GlobalPosition& position, const float& t, const float& t_error, const float& weight);
-if (&track==0) return timeMeasurementsVector; // this function should not have been called in the first place
+ // Useless test; compiler can assume it's false and optimize it away.
+ // Tests for null must be done on pointers, not references
+ // (which by definition cannot be null).
+ //if (&track==0) return timeMeasurementsVector; // this function should not have been called in the first place
float time = 0.;
Amg::Vector3D position(0., 0., 0.);
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx
index 7bbc6fe0a50e5117df4ccceed4f2e4a4af68e63b..15183e90a8a35db88aa908247af9af3bf1b21e60 100755
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx
@@ -193,10 +193,12 @@ namespace InDet
if( trackParticle->summaryValue( temp , xAOD::numberOfSCTHits) ) ncl += temp;
if( trackParticle->summaryValue( temp , xAOD::numberOfTRTHits) ) ntrt += temp;
if(i==0) {
- if(ncl>0) isSi1 = true; if(ncl==0 && ntrt>0) isTrt1 = true;
+ if(ncl>0) isSi1 = true;
+ if(ncl==0 && ntrt>0) isTrt1 = true;
}
if(i==1) {
- if(ncl>0) isSi2 = true; if(ncl==0 && ntrt>0) isTrt2 = true;
+ if(ncl>0) isSi2 = true;
+ if(ncl==0 && ntrt>0) isTrt2 = true;
}
//Decide on the type of track combination in vertex
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx
index 6b892b5e9c9c70c0c1d557f3ea034623466140c5..e7957afdfa7c18699b3e8b56e889622fa7b18346 100755
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx
@@ -130,7 +130,8 @@ std::ostream& InDet::operator <<
MsgStream& InDet::InDetTrackPRD_Association::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumptools(out);
+ if(m_nprint) return dumpevent(out);
+ return dumptools(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
index 495c45fa41bf45e8466b4077aecdaa74646c73a1..cf8501f5b58d03123dd9943dc02a2d893ad71a80 100755
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
@@ -517,7 +517,8 @@ StatusCode InDet::TRT_SeededTrackFinder::finalize()
MsgStream& InDet::TRT_SeededTrackFinder::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumptools(out);
+ if(m_nprint) return dumpevent(out);
+ return dumptools(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/TRT_TrackExtensionAlg.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/TRT_TrackExtensionAlg.cxx
index 66a5d926eb755340c54a3be1d78da050ba6c2c7f..eeae3bc78a9063a89532e24acaac10f8208d3991 100755
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/TRT_TrackExtensionAlg.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/TRT_TrackExtensionAlg.cxx
@@ -89,7 +89,8 @@ StatusCode InDet::TRT_TrackExtensionAlg::execute()
for (t=inputTracks->begin(); t!=te; ++t) {
- if(!(*t)) continue; ++m_nTracks;
+ if(!(*t)) continue;
+ ++m_nTracks;
std::vector<const Trk::MeasurementBase*>& tn = m_trtExtension->extendTrack(*(*t));
if(!tn.size()) continue;
@@ -150,7 +151,8 @@ std::ostream& InDet::operator <<
MsgStream& InDet::TRT_TrackExtensionAlg::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
index a85eb82f8a06c02e48a99a623634f3fa7e86a29d..5ae7c89c93aee324b43a050fe9666057ee2ade9a 100755
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
@@ -119,7 +119,7 @@ InDetSVWithMuonTool::InDetSVWithMuonTool(const std::string& type,
if( m_RlayerB ==0.) m_RlayerB =34.0;
if( m_Rlayer1 ==0.) m_Rlayer1 =51.6;
if( m_Rlayer2 ==0.) m_Rlayer2 =90.0;
- m_Rlayer3 =122.5;
+ m_Rlayer3 =122.5;
} else { // 3-layer pixel detector
if( m_Rbeampipe==0.) m_Rbeampipe=29.4;
if( m_RlayerB ==0.) m_RlayerB =51.5;
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
index 19508277ba7d112a2019b8cf5384a65342e9605d..0b68c9512f03a3860fb9fb2d2bf0838a2f084abe 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
@@ -904,6 +904,10 @@ InDet::InDetTrackSelectionTool::accept( const Trk::Track& track,
/// function does not change the cut levels if they
/// have been altered from their default (no cut) value.
///
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
void InDet::InDetTrackSelectionTool::setCutLevel(InDet::CutLevel level, Bool_t overwrite )
{
#ifndef XAOD_STANDALONE
@@ -915,6 +919,9 @@ void InDet::InDetTrackSelectionTool::setCutLevel(InDet::CutLevel level, Bool_t o
}
setCutLevelPrivate(level, overwrite);
}
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
void InDet::InDetTrackSelectionTool::setCutLevelPrivate(InDet::CutLevel level, Bool_t overwrite)
{
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
index 90249bea0bf03c6a5facafa6e540ffe64e844380..386908cb5269fa8c1798d86a64e9a8ce026b2cb3 100755
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
@@ -309,7 +309,9 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
- if(PixelHits<0)PixelHits=0; if(SctHits<0)SctHits=0; if(BLayHits<0)BLayHits=0;
+ if(PixelHits<0)PixelHits=0;
+ if(SctHits<0)SctHits=0;
+ if(BLayHits<0)BLayHits=0;
delete testSum;
}
//---------------------------------------------------------
@@ -347,11 +349,14 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
- if(PixelHits<0)PixelHits=0; if(SctHits<0)SctHits=0; if(BLayHits<0)BLayHits=0;
+ if(PixelHits<0)PixelHits=0;
+ if(SctHits<0)SctHits=0;
+ if(BLayHits<0)BLayHits=0;
delete testSum;
}
//---------------------------------------------------------
- if(SharedHits>0) SharedHits--; BLayHits++; PixelHits++;
+ if(SharedHits>0) SharedHits--;
+ BLayHits++; PixelHits++;
m_fitSvc->VKalGetImpact((*i_ntrk), m_BeamCnst, 1, Impact, ImpactError);
double ImpactA0=Impact[0];
StatusCode sc = CutTrk( VectPerig[4] , VectPerig[3] , ImpactA0 ,
@@ -480,7 +485,9 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
- if(PixelHits<0)PixelHits=0; if(SctHits<0)SctHits=0; if(BLayHits<0)BLayHits=0;
+ if(PixelHits<0)PixelHits=0;
+ if(SctHits<0)SctHits=0;
+ if(BLayHits<0)BLayHits=0;
//double ImpactSignif = m_fitSvc->VKalGetImpact((*i_nprt), m_BeamCnst, 1, Impact, ImpactError); //VK ImpactSignif not needed
m_fitSvc->VKalGetImpact((*i_nprt), m_BeamCnst, 1, Impact, ImpactError);
double ImpactA0=VectPerig[0]; //double ImpactZ=VectPerig[1]; // Temporary
@@ -515,8 +522,11 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
- if(PixelHits<0)PixelHits=0; if(SctHits<0)SctHits=0; if(BLayHits<0)BLayHits=0;
- if(SharedHits>0) SharedHits--; BLayHits++; PixelHits++;
+ if(PixelHits<0)PixelHits=0;
+ if(SctHits<0)SctHits=0;
+ if(BLayHits<0)BLayHits=0;
+ if(SharedHits>0) SharedHits--;
+ BLayHits++; PixelHits++;
m_fitSvc->VKalGetImpact((*i_nprt), m_BeamCnst, 1, Impact, ImpactError);
double ImpactA0=Impact[0];
StatusCode sc = CutTrk( VectPerig[4] , VectPerig[3] , ImpactA0 ,
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
index 9a9194ef823446747060350cc2d1e0e1e98d99df..09c8cd94d87cb87f0d28770c3370a9af3b133ceb 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
@@ -46,8 +46,8 @@ InDet::PixelToTPIDTool::PixelToTPIDTool(const std::string& t,
AthAlgTool(t,n,p),
m_IBLParameterSvc("IBLParameterSvc",n),
m_overflowIBLToT(0),
- m_pixelid(nullptr),
- m_offlineCalibSvc("PixelOfflineCalibSvc", n)
+ m_offlineCalibSvc("PixelOfflineCalibSvc", n),
+ m_pixelid(nullptr)
{
declareInterface<IPixelToTPIDTool>(this);
declareProperty("CalibrationFile", m_filename = "mcpar_signed_234.txt");
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
index 28f8456fcad7a5e10ddabfd9114113ae824359ff..71afec484baa4acd760ac97f5808101918baa79e 100755
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
@@ -245,7 +245,8 @@ StatusCode InDet::TRT_SeededTrackFinder_ATL::finalize()
MsgStream& InDet::TRT_SeededTrackFinder_ATL::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumpconditions(out);
+ if(m_nprint) return dumpevent(out);
+ return dumpconditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -1092,7 +1093,8 @@ bool InDet::TRT_SeededTrackFinder_ATL::newClusters(const std::list<const Trk::Sp
int m = 0;
for(; t[0]!=te; ++t[0]) {
if (m==30) return false;
- if( (*t[0]).first != prd[0] ) break; trk[0][m++] = (*t[0]).second;
+ if( (*t[0]).first != prd[0] ) break;
+ trk[0][m++] = (*t[0]).second;
if(m==200) break;
}
@@ -1150,7 +1152,8 @@ bool InDet::TRT_SeededTrackFinder_ATL::newSeed(const std::list<const Trk::SpaceP
int m = 0;
for(tt=t[0]; tt!=te; ++tt) {
- if( (*tt).first != prd[0] ) break; trk[0][m++] = (*tt).second;
+ if( (*tt).first != prd[0] ) break;
+ trk[0][m++] = (*tt).second;
if(m==200) break;
}
@@ -1181,7 +1184,8 @@ bool InDet::TRT_SeededTrackFinder_ATL::newSeed(const std::list<const Trk::SpaceP
if((*tt).second->trackStateOnSurfaces()->size() >= 10) {++h; break;}
}
}
- if(h) return false; return true;
+ if(h) return false;
+ return true;
}
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
index 03a41573eb1d59bdb25ddf1a1dd37e4945a5b57b..bf73e1d3adc85087640d71de15ecb1596ba8be93 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
@@ -142,7 +142,8 @@ StatusCode InDet::TRT_TrackExtensionToolCosmics::finalize()
MsgStream& InDet::TRT_TrackExtensionToolCosmics::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
index d1336a03ffcd8a2703bc13ccb053735d058213ed..a9a9ae79ee70d79f48d46ff96afafabf339ef924 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
@@ -225,7 +225,8 @@ StatusCode InDet::TRT_TrackExtensionTool_xk::finalize()
MsgStream& InDet::TRT_TrackExtensionTool_xk::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
@@ -487,7 +488,8 @@ StatusCode InDet::TRT_TrackExtensionTool_xk::magneticFieldInit(IOVSVC_CALLBACK_A
{
// Build MagneticFieldProperties
//
- if(!m_fieldService->solenoidOn()) m_fieldmode ="NoField"; magneticFieldInit();
+ if(!m_fieldService->solenoidOn()) m_fieldmode ="NoField";
+ magneticFieldInit();
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
index 9b6bf7236a9fd8af158fa31741ae09d52720ef69..da19daa6055d6730e743ab077939d45ec22f0e55 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
@@ -506,7 +506,7 @@ const Trk::RIO_OnTrack* InDet::TRT_TrajectoryElement_xk::rioOnTrack()
(&(m_link[l].cluster()->detectorElement())->surface(m_link[l].cluster()->identify()));
Trk::AtaStraightLine Tp(m_link[l].impact(),m_link[l].zlocal(),1.,1.,1.,*line);
if(m_status==2) return m_riomakerD->correct(*m_link[l].cluster(),Tp);
- return m_riomakerN->correct(*m_link[l].cluster(),Tp);
+ return m_riomakerN->correct(*m_link[l].cluster(),Tp);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
index 01b162b974595a94dc8bc6ac73e697d6844a1493..152702096ad05965e7fd3a3e1b27003a323244f7 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
@@ -103,7 +103,8 @@ void InDet::TRT_Trajectory_xk::initiateForPrecisionSeed
q = m_elements[m_nElements].initiateForPrecisionSeed(false,(*d),ti,te,(*i),A,m_roadwidth2);
}
- if(q && m_elements[m_nElements].nlinks()) ++m_nElements; if(++d==de) break;
+ if(q && m_elements[m_nElements].nlinks()) ++m_nElements;
+ if(++d==de) break;
// New trajectory direction calculation
//
@@ -427,8 +428,10 @@ void InDet::TRT_Trajectory_xk::buildTrajectoryForPrecisionSeed
bool h = false ;
if (m_elements[e].buildForPrecisionSeed(m_A,m_B,q,h)) { // Cluster
- if(++m_nclusters==1) m_firstTrajectory=e; m_lastTrajectory=e;
- if(q) ++m_ntclusters; m_nholes = m_nholese;
+ if(++m_nclusters==1) m_firstTrajectory=e;
+ m_lastTrajectory=e;
+ if(q) ++m_ntclusters;
+ m_nholes = m_nholese;
}
else if(h) { // Hole
m_nclusters ? ++m_nholese : ++m_nholesb;
@@ -455,8 +458,10 @@ void InDet::TRT_Trajectory_xk::buildTrajectoryForTRTSeed
bool h = false ;
if (m_elements[e].buildForTRTSeed(m_A,m_B,q,h)) { // Cluster
- if(++m_nclusters==1) m_firstTrajectory=e; m_lastTrajectory=e;
- if(q) ++m_ntclusters; m_nholes = m_nholese;
+ if(++m_nclusters==1) m_firstTrajectory=e;
+ m_lastTrajectory=e;
+ if(q) ++m_ntclusters;
+ m_nholes = m_nholese;
}
else if(h) { // Hole
m_nclusters ? ++m_nholese : ++m_nholesb;
@@ -738,7 +743,8 @@ bool InDet::TRT_Trajectory_xk::fitter()
rad+=trad;
bool br = m_elements[e].isBarrel();
- if( (br && !barrel) || (!br && barrel) ) rad+=.1; barrel = br;
+ if( (br && !barrel) || (!br && barrel) ) rad+=.1;
+ barrel = br;
if(m_elements[e].status() > 0) {
@@ -824,7 +830,8 @@ void InDet::TRT_Trajectory_xk::stabline(int Np,double DA) {
i-=2;
}
- if(m<=4) break; sort(m_SS,m);
+ if(m<=4) break;
+ sort(m_SS,m);
int nm = 0; s = 0; sm=-1000;
for(int i=0; i!=m-1; ++i) {
@@ -882,7 +889,8 @@ Trk::Track* InDet::TRT_Trajectory_xk::convert(const Trk::Track& Tr)
rad+=trad;
bool br = m_elements[e].isBarrel();
- if( (br && !barrel) || (!br && barrel) ) rad+=.1; barrel = br;
+ if( (br && !barrel) || (!br && barrel) ) rad+=.1;
+ barrel = br;
if(m_elements[e].status() > 0) {
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsUtils_xk.h b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsUtils_xk.h
index 6f231829aa8587767148d42dd80a63ee6ebfb1ea..a3cb4346fb8bfc24eb26619d9a6f17257f4c2470 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsUtils_xk.h
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsUtils_xk.h
@@ -110,7 +110,8 @@ namespace InDet{
template<class Tem> void TRT_TrackSegmentsUtils_xk::findStraightLine
(int Np, Tem* par, const Tem* X, const Tem* Y)
{
- if(m_size<2 || Np<2 ) return; if(Np>m_size) Np = m_size;
+ if(m_size<2 || Np<2 ) return;
+ if(Np>m_size) Np = m_size;
Tem A = par[0];
Tem B = par[1];
@@ -171,7 +172,8 @@ namespace InDet{
i-=2;
}
- if(m<=4) break; sort(m_F,m_NA,m);
+ if(m<=4) break;
+ sort(m_F,m_NA,m);
int nm = 0; s = 0; sm=-1000;
for(int i=0; i!=m-1; ++i) {
@@ -208,7 +210,8 @@ namespace InDet{
if(j-i>1) {
int ip=(j+i)>>1, q=j; Tem ta=a[ip]; a[ip]=a[i]; int tb=b[ip]; b[ip]=b[i];
for(int k =i+1; k<=q; ++k) {
- if(a[k]<=ta) continue; int l=q;
+ if(a[k]<=ta) continue;
+ int l=q;
while(1) {
if(a[l]<ta) {
Tem x=a[k]; a[k]=a[l]; a[l]=x;
@@ -226,7 +229,9 @@ namespace InDet{
Tem x=a[i]; a[i]=a[j]; a[j]=x;
int y=b[i]; b[i]=b[j]; b[j]=y;
}
- if(--m<0) return; i=lt[m]; j=mt[m];
+ if(--m<0) return;
+ i=lt[m];
+ j=mt[m];
}
}
}
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx
index 803230fd52fb8798aa96a08fd6e57f8a2ca0beaa..447296c05297842b897efb4de46c3d084b16d117 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx
@@ -436,7 +436,8 @@ void InDet::TRT_TrackSegmentsMaker_ATLxk::find()
Trk::TrackSegment* InDet::TRT_TrackSegmentsMaker_ATLxk::next()
{
- if(m_segiterator!=m_segments.end()) return (*m_segiterator++); return 0;
+ if(m_segiterator!=m_segments.end()) return (*m_segiterator++);
+ return 0;
}
///////////////////////////////////////////////////////////////////
@@ -446,7 +447,8 @@ Trk::TrackSegment* InDet::TRT_TrackSegmentsMaker_ATLxk::next()
MsgStream& InDet::TRT_TrackSegmentsMaker_ATLxk::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx
index 18f3b0923a07945c91a20b08feebebcb0cb9d79d..df9b51f9f3334e0d1632ad814127c8dca8d11310 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx
@@ -1716,7 +1716,8 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I
Trk::TrackSegment* InDet::TRT_TrackSegmentsMaker_ECcosmics::next()
{
- if(m_segiterator!=m_segments.end()) return (*m_segiterator++); return 0;
+ if(m_segiterator!=m_segments.end()) return (*m_segiterator++);
+ return 0;
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/LooseTrackVertexAssociationTool.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/LooseTrackVertexAssociationTool.cxx
index fd45f035d0646ddee11fba7fd3d652a715236958..3c3ea559ef3d1617f973a0e949d1475a40f52768 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/LooseTrackVertexAssociationTool.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/LooseTrackVertexAssociationTool.cxx
@@ -216,9 +216,7 @@ namespace CP
float theta=trk.theta();
// check the vertex, return false if the vertex is a dummy one
- if(&vx!=NULL)
- {
- if(vx.vertexType()!=xAOD::VxType::NoVtx) // select good vertex
+ if(vx.vertexType()!=xAOD::VxType::NoVtx) // select good vertex
{
float vx_z0=vx.z();
if(fabs((trk_z0-vx_z0+beamspot_z0)*sin(theta))<m_dz_cut && fabs(trk_d0)<=m_d0_cut) // cut
@@ -228,17 +226,11 @@ namespace CP
}
else return false;
}
- else
+ else
{
ATH_MSG_DEBUG("The Vertex is a fake one, will not do track-vertex association");
return false;
}
- }
- else
- {
- ATH_MSG_DEBUG("Invalid Vertex pointer, return false");
- return false;
- }
}
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TightTrackVertexAssociationTool.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TightTrackVertexAssociationTool.cxx
index 9277444795e33fbda13e90c41bd759b27c79f7b2..9b32375476320ed64bddb6caa7111d0e70e5e835 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TightTrackVertexAssociationTool.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TightTrackVertexAssociationTool.cxx
@@ -233,9 +233,7 @@ namespace CP
{
ATH_MSG_DEBUG("<###### Enter: doTightMatch() function ######>");
- if(&vx!=NULL)
- {
- if(vx.vertexType()!=xAOD::VxType::NoVtx )
+ if(vx.vertexType()!=xAOD::VxType::NoVtx )
{
if(trk.vertex()==&vx) // check whether the track is used for the given vertex fit.
@@ -271,17 +269,11 @@ namespace CP
}
else return UnMatch;
}
- else
+ else
{
ATH_MSG_DEBUG("The vertex is a fake one");
return UnMatch;
}
- }
- else
- {
- ATH_MSG_DEBUG("Invalid Vertex pointer, return false");
- return UnMatch;
- }
return Matched;
}
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/TrigConversionFinder.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/TrigConversionFinder.cxx
index 8faddd2a9300a7e8a0dd689a9705bfe5c32c6041..8e9570dfd37d5ba06351774a55d0cff92a7e0a12 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/TrigConversionFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/TrigConversionFinder.cxx
@@ -182,10 +182,12 @@ namespace InDet
int ncl = summary->get(Trk::numberOfPixelHits) + summary->get(Trk::numberOfSCTHits);
int ntrt = summary->get(Trk::numberOfTRTHits);
if(i==0) {
- if(ncl>0) isSi1 = true; if(ncl==0 && ntrt>0) isTrt1 = true;
+ if(ncl>0) isSi1 = true;
+ if(ncl==0 && ntrt>0) isTrt1 = true;
}
if(i==1) {
- if(ncl>0) isSi2 = true; if(ncl==0 && ntrt>0) isTrt2 = true;
+ if(ncl>0) isSi2 = true;
+ if(ncl==0 && ntrt>0) isTrt2 = true;
}
}//end of dynamic_cast check
}//end of ITrackLink existance check
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/InDetTrigTrackPRD_Association.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/InDetTrigTrackPRD_Association.cxx
index 2dba70170838d03dd7ab0b0c31d5f6be888d1242..7628edf3b0b933c1d2e9b0bb5356dcd2a511cc30 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/InDetTrigTrackPRD_Association.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/InDetTrigTrackPRD_Association.cxx
@@ -147,7 +147,8 @@ std::ostream& InDet::operator <<
MsgStream& InDet::InDetTrigTrackPRD_Association::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumptools(out);
+ if(m_nprint) return dumpevent(out);
+ return dumptools(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
index e1bff9915255ae1f26b5ff8052c858ce43e3e9be..246aea9b05322a0d67e10ef65f29b47691dc7552 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
@@ -345,7 +345,8 @@ HLT::ErrorCode InDet::TRT_TrigSeededTrackFinder::hltFinalize() {
MsgStream& InDet::TRT_TrigSeededTrackFinder::dump( MsgStream& out ) const {
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumptools(out);
+ if(m_nprint) return dumpevent(out);
+ return dumptools(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/TRT_TrigTrackExtensionAlg.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/TRT_TrigTrackExtensionAlg.cxx
index c694cecc62b33df23b1e54eb8ff7dbd7dcb8e5e6..b4199e33a490362e41a4eb8c800d6e5cb835349d 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/TRT_TrigTrackExtensionAlg.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/TRT_TrigTrackExtensionAlg.cxx
@@ -182,7 +182,8 @@ std::ostream& InDet::operator <<
MsgStream& InDet::TRT_TrigTrackExtensionAlg::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
index 80fda9871f40b99d8c2ca98605345610d4fdd643..01c62aee23e4afbb6d623822c4486931b01f51b8 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
@@ -242,7 +242,8 @@ std::ostream& InDet::operator <<
MsgStream& InDet::TRT_TrigTrackSegmentsFinder::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumptools(out);
+ if(m_nprint) return dumpevent(out);
+ return dumptools(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx
index 230c84a16f2676f1ca04337173e1647eea9c237b..e57ce3fd072e7fae031439a3f777cc979d0be82f 100644
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx
@@ -203,7 +203,8 @@ std::ostream& InDet::operator <<
MsgStream& InDet::SegmentDriftCircleAssValidation::dump( MsgStream& out ) const
{
out<<std::endl;
- if(m_nprint) return dumpevent(out); return dumptools(out);
+ if(m_nprint) return dumpevent(out);
+ return dumptools(out);
}
///////////////////////////////////////////////////////////////////
diff --git a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/AlignAlg.cxx b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/AlignAlg.cxx
index accecf4c2cc994e1d0fe37171d53797f12c68c20..d9c89041f6f08faed2a750898c2b5d30889f9c54 100644
--- a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/AlignAlg.cxx
+++ b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/AlignAlg.cxx
@@ -32,8 +32,8 @@ AlignAlg::AlignAlg(const std::string& name, ISvcLocator* pSvcLocator)
, m_alignTool("Trk::GlobalChi2AlignTool",this)
, m_geometryManagerTool("Muon::MuonGeometryManagerTool") // use as public tool
, m_trkAlignDBTool("Trk::TrkAlignDBTool", this)
- , m_nDoF(-1)
, m_fillNtupleTool("",this)
+ , m_nDoF(-1)
, m_ntuple(0)
, m_logStream(0)
, m_nevents(0)
diff --git a/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx b/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx
index 379bb9b495c59df1e5d682c2611b16da9a41005f..1341f40ea52ac93d08a44484f2480925ef7669b1 100755
--- a/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx
+++ b/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx
@@ -23,9 +23,12 @@ namespace Trk
MvfFitInfo::~MvfFitInfo()
{
- if (m_constraintVertex!=0) delete m_constraintVertex; m_constraintVertex=0;
- if (m_seedVertex!=0) delete m_seedVertex; m_seedVertex=0;
- if (m_linearizationVertex!=0) delete m_linearizationVertex; m_linearizationVertex=0;
+ if (m_constraintVertex!=0) delete m_constraintVertex;
+ m_constraintVertex=0;
+ if (m_seedVertex!=0) delete m_seedVertex;
+ m_seedVertex=0;
+ if (m_linearizationVertex!=0) delete m_linearizationVertex;
+ m_linearizationVertex=0;
}//end of destructor
MvfFitInfo::MvfFitInfo(const MvfFitInfo& rhs):
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx
index 3a7e2ec1ea181286ccc27adbdd840ea02683d7ae..22ea664f3e6522456f1173383ce33e3d612cafd2 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/JetFitterInitializationHelper.cxx
@@ -39,110 +39,6 @@ namespace Trk
return numVertex+5;
}
- std::pair<double,double> getPhiAndThetaError(const Amg::Vector3D & jetdirection)
- {
- double pT=jetdirection.perp();
- double eta=jetdirection.eta();
-
- if (pT<30000.)
- {
- if (fabs(eta)<0.5)
- {
- return std::pair<double,double>(0.0745324,0.0707118);
- }
- else if (fabs(eta)>0.5 && fabs(eta)<1.5)
- {
- return std::pair<double,double>(0.0706129,0.0700991);
- }
- else
- {
- return std::pair<double,double>(0.0637408,0.0625573);
- }
- }
- else if (pT>30000.&&pT<50000.)
- {
- if (fabs(eta)<0.5)
- {
- return std::pair<double,double>(0.0471643,0.0522802);
- }
- else if (fabs(eta)>0.5 && fabs(eta)<1.5)
- {
- return std::pair<double,double>(0.0481275,0.0496884);
- }
- else
- {
- return std::pair<double,double>(0.0424792,0.0430283);
- }
- } else if (pT>50000.&&pT<80000.)
- {
- if (fabs(eta)<0.5)
- {
- return std::pair<double,double>(0.0413781,0.0483138);
- }
- else if (fabs(eta)>0.5 && fabs(eta)<1.5)
- {
- return std::pair<double,double>(0.0403793,0.0446019);
- }
- else
- {
- return std::pair<double,double>(0.0386421,0.040443);
- }
- } else if (pT>80000.&&pT<120000.)
- {
- if (fabs(eta)<0.5)
- {
- return std::pair<double,double>(0.0418976,0.0513061);
- }
- else if (fabs(eta)>0.5 && fabs(eta)<1.5)
- {
- return std::pair<double,double>(0.0421726,0.0463102);
- }
- else
- {
- return std::pair<double,double>(0.0400686,0.0432175);
- }
- } else if (pT>120000.)
- {
- if (fabs(eta)<0.5)
- {
- return std::pair<double,double>(0.0477842,0.0562935);
- }
- else if (fabs(eta)>0.5 && fabs(eta)<1.5)
- {
- return std::pair<double,double>(0.0489627,0.0511563);
- }
- else
- {
- return std::pair<double,double>(0.0465861,0.0463104);
- }
- }
- std::cout << " HELP HELP error found" << std::endl;
- throw;
- // return std::pair<double,double>(0,0);
- }
-
-
-
-
-
- Amg::Vector3D getSingleVtxPosition(const Amg::VectorX & myPosition,int numVertex) {
- int numbRow=numRow(numVertex);
- double xv=myPosition[Trk::jet_xv];
- double yv=myPosition[Trk::jet_yv];
- double zv=myPosition[Trk::jet_zv];
- double phi=myPosition[Trk::jet_phi];
- double theta=myPosition[Trk::jet_theta];
- double dist=0.;
- if (numbRow>=0) {
- dist=myPosition[numbRow];
- if (fabs(dist)>1000.) {//MAX 1m
- dist=dist/fabs(dist)*1000.;
- }
- }
- return Amg::Vector3D(xv+dist*cos(phi)*sin(theta),
- yv+dist*sin(phi)*sin(theta),
- zv+dist*cos(theta));
- }
Amg::Vector3D getSingleVtxPositionWithSignFlip(const Amg::VectorX & myPosition,
int numVertex,
@@ -316,18 +212,6 @@ namespace Trk
//override default setting...
std::pair<double,double> phiAndThetaError(m_errphiJetAxis,m_erretaJetAxis);
- /*
- if (jetdirection!=0)
- {
-
- //override default setting...
- phiAndThetaError=getPhiAndThetaError(*jetdirection);
-
- std::cout << " Using phi error: " << phiAndThetaError.first << " and eta error: " << phiAndThetaError.second << " for pt: " << jetdirection->perp() <<
- " and eta: " << jetdirection->pseudoRapidity() << std::endl;
-
- }
- */
AmgSymMatrix(3) primaryCovariance(primaryVertex->covariancePosition().block<3,3>(0,0));
AmgSymMatrix(5) startCovariance; startCovariance.setZero();
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx
index 8bbc42a8b9ae28b0f3b7dc816375ef1cc41b5bb8..226a63b95130f8283180f313a466c62f4f075eeb 100755
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/KalmanVertexOnJetAxisSmoother.cxx
@@ -16,13 +16,6 @@
namespace Trk
{
-
- namespace {
- int numRow(int numVertex) {
- return numVertex+5;
- }
- }
-
StatusCode KalmanVertexOnJetAxisSmoother::initialize()
{