Skip to content
Snippets Groups Projects
Commit 4be4cedc authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'main-clang' into 'main'

Fixed clang compilation errors and warnings

See merge request atlas/athena!69488
parents 424107ae 073362cf
No related branches found
No related tags found
No related merge requests found
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#include <memory>
......@@ -26,7 +26,7 @@ StatusCode InDet::SiSPGNNTrackMaker::initialize()
ATH_CHECK(m_trackFitter.retrieve());
ATH_CHECK(m_seedFitter.retrieve());
if (m_useTrackFinder == m_useTrackReader) {
if (m_useTrackFinder.value() == m_useTrackReader.value()) {
ATH_MSG_ERROR("Use either track finder or track reader, not both.");
return StatusCode::FAILURE;
}
......@@ -138,10 +138,10 @@ StatusCode InDet::SiSPGNNTrackMaker::execute(const EventContext& ctx) const
std::unique_ptr<Trk::Track> track = m_trackFitter->fit(ctx, clusters, *trkParameters, false, matEffects);
if (track != nullptr && track->perigeeParameters() != nullptr) {
// fit the track again with perigee parameters and without outlier removal.
track = std::move(m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), false, matEffects));
track = m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), false, matEffects);
if (track != nullptr) {
// finally fit with outlier removal
track = std::move(m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), true, matEffects));
track = m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), true, matEffects);
if (track != nullptr && track->trackSummary() != nullptr) {
outputTracks->push_back(track.release());
}
......
/*
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigITkAccelerationTool.h"
......@@ -197,7 +197,7 @@ int TrigITkAccelerationTool::extractTripletsFromOutput(std::shared_ptr<TrigAccel
for(int k=0;k<nTriplets;k++) {
// Check if a valid triplet was returned
if ((pOutput->m_innerIndex[k] == pOutput->m_outerIndex[k])) continue;
if (pOutput->m_innerIndex[k] == pOutput->m_outerIndex[k]) continue;
const TrigSiSpacePointBase& SPi = vsp[pOutput->m_innerIndex[k]];
const TrigSiSpacePointBase& SPm = vsp[pOutput->m_middleIndex[k]];
......@@ -216,4 +216,4 @@ float TrigITkAccelerationTool::getCovR(bool isBarrel) const {
float TrigITkAccelerationTool::getCovZ(bool isBarrel) const {
if (isBarrel) return 0.02*0.02;
else return 0.01*0.01;
}
\ No newline at end of file
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment