diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
index f1444fb42b0d6a3ed7466c4f4ba896bac047f3ab..5956209050abe49d4e1d51e85f3fac1688d00a47 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
@@ -149,7 +149,7 @@ class GeoPixelDiskSupports : public GeoVPixelFactory {
private:
std::vector<double> m_rmin,m_rmax,m_halflength,m_zpos;
std::vector<std::string> m_material;
- int m_nframe;
+ int m_nframe{0};
};
@@ -299,7 +299,7 @@ class GeoPixelServices : public GeoVPixelFactory {
std::vector<double> m_rmin,m_rmax,m_halflength,m_zpos;
std::vector<std::string> m_material;
std::string m_zone;
- int m_nframe;
+ int m_nframe{0};
};
diff --git a/InnerDetector/InDetPerformance/SCTExtension/src/SCTExtensionAlg.cxx b/InnerDetector/InDetPerformance/SCTExtension/src/SCTExtensionAlg.cxx
index 7563b0f67e31595a586184d1c1e2fff34bf92c6c..09f8672008835ba166e000d84b14d216299a36ae 100644
--- a/InnerDetector/InDetPerformance/SCTExtension/src/SCTExtensionAlg.cxx
+++ b/InnerDetector/InDetPerformance/SCTExtension/src/SCTExtensionAlg.cxx
@@ -49,7 +49,7 @@ StatusCode SCTExtensionAlg::execute(const EventContext& ctx) const {
int n_tracks=0;
int n_tracklets=0;
- for (mytracklet = tracklets->begin(); mytracklet != tracklets->end(); mytracklet++) // Loop over tracklets
+ for (mytracklet = tracklets->begin(); mytracklet != tracklets->end(); ++mytracklet) // Loop over tracklets
{
n_tracklets++;
int nSharedHits=0;
@@ -80,7 +80,7 @@ StatusCode SCTExtensionAlg::execute(const EventContext& ctx) const {
} // End: tracklet_Measurements
xAOD::TrackParticleContainer::const_iterator mytrack;
- for (mytrack = trks->begin(); mytrack != trks->end(); mytrack++) // Loop over tracks for each tracklet
+ for (mytrack = trks->begin(); mytrack != trks->end(); ++mytrack) // Loop over tracks for each tracklet
{
n_tracks++;
const xAOD::TrackParticle* trackParticle = *mytrack;
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
index cf1a643c2ec58c99c4ff149f509ba184811d7acc..19348d6653e5ff9ba7279344ffd225356c4ad27c 100644
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
@@ -223,7 +223,7 @@ InDet::InDetExtensionProcessor::createExtendedTracks(const EventContext& ctx,
// loop over extension RIO-on-tracks and add PRD it into vecPrdComb
DataVector<const Trk::MeasurementBase>::const_iterator RIOit =
pThisExtensionPair->first->measurementsOnTrack()->begin();
- for (; RIOit != pThisExtensionPair->first->measurementsOnTrack()->end(); RIOit++) {
+ for (; RIOit != pThisExtensionPair->first->measurementsOnTrack()->end(); ++RIOit) {
const Trk::RIO_OnTrack* rot = dynamic_cast <const Trk::RIO_OnTrack*> (*RIOit);
if (!rot) ATH_MSG_ERROR("cast to ROT failed, should not happen here !");
else vecPrdComb.push_back(rot->prepRawData());
@@ -290,7 +290,7 @@ InDet::InDetExtensionProcessor::createExtendedTracks(const EventContext& ctx,
// extract RIO-on-tracks from extension
DataVector<const Trk::MeasurementBase>::const_iterator RIOit =
pThisExtensionPair->first->measurementsOnTrack()->begin();
- for (; RIOit != pThisExtensionPair->first->measurementsOnTrack()->end(); RIOit++) {
+ for (; RIOit != pThisExtensionPair->first->measurementsOnTrack()->end(); ++RIOit) {
rotSet.push_back(*RIOit);
}
// merge RIO-on-track lists
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx
index 0a709419daf1d9a5a07e45325904f758f9a3872a..66017d334f5f6bc465e92583acd15dbebb6627f2 100755
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx
@@ -147,7 +147,7 @@ InDetAdaptiveMultiPriVxFinderTool::findVertex(
bool selectionPassed;
for (TrackDataVecIter itr = (*trackTES).begin(); itr != (*trackTES).end();
- itr++) {
+ ++itr) {
if (m_useBeamConstraint) {
selectionPassed =
static_cast<bool>(m_trkFilter->accept(**itr, &beamposition));
@@ -204,7 +204,7 @@ InDetAdaptiveMultiPriVxFinderTool::findVertex(
bool selectionPassed;
for (TrackParticleDataVecIter itr = (*trackParticles).begin();
itr != (*trackParticles).end();
- itr++) {
+ ++itr) {
if (m_useBeamConstraint) {
selectionPassed =
static_cast<bool>(m_trkFilter->accept(**itr, &beamposition));
@@ -1012,7 +1012,7 @@ InDetAdaptiveMultiPriVxFinderTool::estimateSignalCompatibility(
for (std::vector<Trk::VxTrackAtVertex*>::iterator i = begintracks;
i != endtracks;
- i++) {
+ ++i) {
if (((*i)->vtxCompatibility() < m_finalCutMaxVertexChi2 &&
m_useFastCompatibility) ||
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx
index d4a75ecfd4f8823006fe85848184d63740cc98ce..69ab8b5b8fd4324604db9e25d34741f05499cd5a 100755
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx
@@ -168,7 +168,7 @@ InDetIterativePriVxFinderTool::findVertex(const EventContext& ctx,
bool selectionPassed;
for (TrackDataVecIter itr = (*trackTES).begin(); itr != (*trackTES).end();
- itr++) {
+ ++itr) {
if (m_useBeamConstraint && beamSpot != nullptr) {
Trk::RecVertex beamPosition{ beamSpot->beamVtx() };
@@ -1032,7 +1032,8 @@ InDetIterativePriVxFinderTool::removeCompatibleTracks(
const Trk::TrackParameters* myPerigee = (*perigeesToFitIter);
if (myPerigee == nullptr) {
- ATH_MSG_ERROR(" Cast to perigee gives 0 pointer ");
+ ATH_MSG_ERROR(" Cast to perigee gives null pointer ");
+ return;
}
double chi2 = compatibility(*myPerigee, *myxAODVertex);
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
index 182c1f0941b58af54198d7ccf2aa7a8569686466..4dc7a0436ed4f05c067fbc9a8c03b3075e4f6f8c 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
@@ -59,7 +59,7 @@ using namespace InDet;
std::vector<const xAOD::IParticle*>::const_iterator trk_end = inputTracks.end();
int counter = 0;
- for ( ; trk_iter != trk_end; trk_iter++ ) {
+ for ( ; trk_iter != trk_end; ++trk_iter ) {
// Convert xAOD::IParticle to xAOD::TrackParticle
const xAOD::TrackParticle * tmp = dynamic_cast< const xAOD::TrackParticle* > ( *trk_iter );
assert( tmp != nullptr ); // in principle should really check that inputTracks only contains TrackParticle objects
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
index 0a09718bf02af3201bcd8d7f4bf151bb9be31e8b..8cf7ec0b8889091e23ba6de84aa9efee64b7349f 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
@@ -16,6 +16,7 @@
#include "TrkMeasurementBase/MeasurementBase.h"
#include "TrkSurfaces/CylinderSurface.h"
#include "TrkTrack/Track.h"
+#include <cmath>
using Amg::Transform3D;
// don't want to include TrackSummary in the header
@@ -438,8 +439,8 @@ InDet::InDetTestBLayerTool::getTrackStateOnPixelLayerInfo(
float error_locx = -9999;
float error_locy = -9999;
- error_locx = sqrt((*trkParam->covariance())(Trk::locX, Trk::locX));
- error_locy = sqrt((*trkParam->covariance())(Trk::locY, Trk::locY));
+ error_locx = std::sqrt((*trkParam->covariance())(Trk::locX, Trk::locX));
+ error_locy = std::sqrt((*trkParam->covariance())(Trk::locY, Trk::locY));
blayerInfo.errLocalX(error_locx);
blayerInfo.errLocalY(error_locy);
@@ -447,12 +448,10 @@ InDet::InDetTestBLayerTool::getTrackStateOnPixelLayerInfo(
bool isgood =
m_pixelCondSummaryTool->isGood(id, InDetConditions::PIXEL_MODULE);
- double phitol = 2.5;
- double etatol = 5.;
- if (trkParam) {
- phitol = 3. * sqrt((*trkParam->covariance())(Trk::locX, Trk::locX));
- etatol = 3. * sqrt((*trkParam->covariance())(Trk::locY, Trk::locY));
- }
+ //defaults would be phitol = 2.5, etatol = 5.
+ double phitol = 3. * std::sqrt((*trkParam->covariance())(Trk::locX, Trk::locX));
+ double etatol = 3. * std::sqrt((*trkParam->covariance())(Trk::locY, Trk::locY));
+
bool isIn = true;
if (sielem) {
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/TRT_SeededSpacePointFinder_ATL.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/TRT_SeededSpacePointFinder_ATL.cxx
index 6949fb9ba2880cda7026ba1d6f96175153bd23e3..6de3eb38f7b904161301f77c21ed1c5e12b44498 100755
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/TRT_SeededSpacePointFinder_ATL.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/TRT_SeededSpacePointFinder_ATL.cxx
@@ -808,7 +808,7 @@ InDet::TRT_SeededSpacePointFinder_ATL::production2Spb(const EventContext& ctx,
zSP.reserve(spcount);
// // // // // // <Fill m_prod_bypass and the local array // // // //
- for (; r != re; r++) {
+ for (; r != re; ++r) {
const Trk::SpacePoint *vrpi = (*r).first;
geo_info.push_back((*r).second);
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
index 40eb4282fbc3452c8afc1d3cc3e571cf89b41870..b0f3d03bc1943529ec8fe5e5571b377e3ec7f73c 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
@@ -328,7 +328,7 @@ void InDet::TRT_TrackExtensionToolCosmics::analyze_tpars(const std::vector<const
//take the closest one in case it satisfies some default cuts
InDet::TRT_DriftCircleCollection::const_iterator driftCircleIterator = container->begin();
- for (; driftCircleIterator != container->end(); driftCircleIterator++) {
+ for (; driftCircleIterator != container->end(); ++driftCircleIterator) {
//get the associated surface of the driftcircle
const Trk::Surface &dc_surface=(*driftCircleIterator)->detectorElement()->surface((*driftCircleIterator)->identify());
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/TRTTrackHoleSearchTool.cxx b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/TRTTrackHoleSearchTool.cxx
index 08a99937ed67e991acc722f9687fb38b973ee946..36c178b904d6b2168fe42510e0ba79f0e6fa7887 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/TRTTrackHoleSearchTool.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/TRTTrackHoleSearchTool.cxx
@@ -17,8 +17,7 @@
// athena
#include "TrkTrack/Track.h"
#include "TrkTrack/TrackStateOnSurface.h"
-//#include "TrkParameters/MeasuredTrackParameters.h"
-//#include "TrkParameters/Perigee.h"
+
#include "TrkParameters/TrackParameters.h"
#include "TrkSurfaces/CylinderSurface.h"
#include "TrkSurfaces/Surface.h"
@@ -371,8 +370,8 @@ void TRTTrackHoleSearchTool::dump_bad_straw_log() const {
ATH_MSG_DEBUG( "TRTTrackHoleSearchTool::dump_bad_straw_log" );
std::ofstream out("TRT_ConditionsSummarySvc_bad_straws.log");
out << "# id barrel_ec phi_module layer_or_wheel straw_layer straw" << std::endl;
- for(std::vector<Identifier>::const_iterator it = m_TRT_ID->straw_layer_begin(); it != m_TRT_ID->straw_layer_end(); it++) {
- for(int i=0; i<= m_TRT_ID->straw_max(*it); i++) {
+ for(std::vector<Identifier>::const_iterator it = m_TRT_ID->straw_layer_begin(); it != m_TRT_ID->straw_layer_end(); ++it) {
+ for(int i=0; i<= m_TRT_ID->straw_max(*it); ++i) {
Identifier id = m_TRT_ID->straw_id(*it, i);
if(!m_conditions_svc->isGood(id)) {
out << id.getString()
@@ -420,8 +419,8 @@ TRTTrackHoleSearchTool::find_last_hit_before_trt(const DataVector<const Trk::Tra
if(track_states.size() < 2 || track_state == track_states.begin()) {
return track_states.end();
}
- track_state--; // step back and look for last measurement before the TRT hit
- for(; track_state != track_states.begin(); track_state--) {
+ --track_state; // step back and look for last measurement before the TRT hit
+ for(; track_state != track_states.begin(); --track_state) {
if((*track_state)->type(Trk::TrackStateOnSurface::Measurement)) {
break;
}