diff --git a/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h b/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h index 1d20fb45b9f4088f6b9ca8814b3dcd42d6b66bba..8e00b5b73458164775afc5c783f82095a9991232 100644 --- a/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h +++ b/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// @@ -89,7 +89,7 @@ public: of the intersecting track. */ virtual const InDet::PixelClusterOnTrack* correct(const Trk::PrepRawData&, - const Trk::TrackParameters&) const; + const Trk::TrackParameters&) const override; virtual const InDet::PixelClusterOnTrack* correctDefault(const Trk::PrepRawData&, const Trk::TrackParameters&) const; diff --git a/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx b/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx index c8aaec5bbf2e237baad088bb071455c03d0b42b4..584f6959c27d70558c45a98235df7b07c46509b4 100644 --- a/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx +++ b/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2018, 2019 CERN for the benefit of the ATLAS collaboration */ #include <vector> #include <string> @@ -30,9 +30,6 @@ using namespace std; using Amg::Vector3D; namespace { - inline double square(const double x){ - return x*x; - } const double ONE_TWELFTH = 1./12.; } diff --git a/Trigger/TrigFTK/FTK_RecTools/src/FTK_PixelClusterOnTrackTool.cxx b/Trigger/TrigFTK/FTK_RecTools/src/FTK_PixelClusterOnTrackTool.cxx index cfe0500eb3c8f46e5dbb2a893c78574ba0dee90f..36a44e54fc02f7fc7509fcd4f1dcfad4c9e01a30 100644 --- a/Trigger/TrigFTK/FTK_RecTools/src/FTK_PixelClusterOnTrackTool.cxx +++ b/Trigger/TrigFTK/FTK_RecTools/src/FTK_PixelClusterOnTrackTool.cxx @@ -852,7 +852,7 @@ FTK_PixelClusterOnTrackTool::getErrorsTIDE_Ambi(const InDet::PixelCluster *pixel bool correctdR = false; - std::array<float, 3> correctiondR = {0., 0., 0.}; + std::array<float, 3> correctiondR = {{0., 0., 0.}}; if(m_applydRcorrection){ SG::ReadHandle<InDet::DRMap> mapHandle(m_dRMap);