Skip to content
Snippets Groups Projects
Commit 84a6f13d authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'clang.DerivationFrameworkInDet-20210214' into 'master'

DerivationFrameworkInDet+DerivationFrameworkMuons+DerivationFrameworkExotics: Fix clang warnings.

See merge request atlas/athena!40654
parents 7e58215a aa364f3b
No related branches found
No related tags found
No related merge requests found
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
...@@ -87,14 +87,14 @@ bool DerivationFramework::SkimmingToolEXOT5::eventPassesFilter() const ...@@ -87,14 +87,14 @@ bool DerivationFramework::SkimmingToolEXOT5::eventPassesFilter() const
recoJets->setStore(recoJetsAux.get()); recoJets->setStore(recoJetsAux.get());
std::pair<xAOD::JetContainer*, xAOD::ShallowAuxContainer*> jets_shallowCopy = xAOD::shallowCopyContainer(*jets); std::pair<xAOD::JetContainer*, xAOD::ShallowAuxContainer*> jets_shallowCopy = xAOD::shallowCopyContainer(*jets);
for (const auto &jet : *jets_shallowCopy.first) { for (const auto jet : *jets_shallowCopy.first) {
if (jet->pt() > 100000.) passUncalibMonojetCut = true; if (jet->pt() > 100000.) passUncalibMonojetCut = true;
} }
if (m_jetCalibrationTool->applyCalibration(*jets_shallowCopy.first).isFailure()) { if (m_jetCalibrationTool->applyCalibration(*jets_shallowCopy.first).isFailure()) {
ATH_MSG_ERROR("Problem applying jet calibration"); ATH_MSG_ERROR("Problem applying jet calibration");
return false; return false;
} }
for (const auto &jet : *jets_shallowCopy.first) { for (const auto jet : *jets_shallowCopy.first) {
xAOD::Jet* newJet = new xAOD::Jet(); xAOD::Jet* newJet = new xAOD::Jet();
newJet->makePrivateStore(*jet); newJet->makePrivateStore(*jet);
recoJets->push_back(newJet); recoJets->push_back(newJet);
...@@ -120,7 +120,7 @@ bool DerivationFramework::SkimmingToolEXOT5::eventPassesFilter() const ...@@ -120,7 +120,7 @@ bool DerivationFramework::SkimmingToolEXOT5::eventPassesFilter() const
std::unique_ptr<xAOD::JetAuxContainer> truthJetsAux = make_unique<xAOD::JetAuxContainer>(); std::unique_ptr<xAOD::JetAuxContainer> truthJetsAux = make_unique<xAOD::JetAuxContainer>();
truthJets->setStore(truthJetsAux.get()); truthJets->setStore(truthJetsAux.get());
for (const auto &truthJet : *truthJetContainer) { for (const auto truthJet : *truthJetContainer) {
xAOD::Jet* newTruthJet = new xAOD::Jet(); xAOD::Jet* newTruthJet = new xAOD::Jet();
newTruthJet->makePrivateStore(*truthJet); newTruthJet->makePrivateStore(*truthJet);
truthJets->push_back(newTruthJet); truthJets->push_back(newTruthJet);
......
/* /*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
...@@ -322,7 +322,7 @@ namespace DerivationFramework { ...@@ -322,7 +322,7 @@ namespace DerivationFramework {
std::vector<SG::WriteDecorHandle<xAOD::TrackParticleContainer,float> > std::vector<SG::WriteDecorHandle<xAOD::TrackParticleContainer,float> >
trackPixFloatDecorators = createDecorators<xAOD::TrackParticleContainer,float>(m_trackPixFloatDecorKeys,ctx); trackPixFloatDecorators = createDecorators<xAOD::TrackParticleContainer,float>(m_trackPixFloatDecorKeys,ctx);
// -- Run over each track and decorate it // -- Run over each track and decorate it
for (const auto& track : *tracks) { for (const auto track : *tracks) {
//-- Start with things that do not need a Trk::Track object //-- Start with things that do not need a Trk::Track object
// -- Now things that require a Trk::Track object // -- Now things that require a Trk::Track object
...@@ -410,7 +410,7 @@ namespace DerivationFramework { ...@@ -410,7 +410,7 @@ namespace DerivationFramework {
// -- Add Track states to the current track, filtering on their type // -- Add Track states to the current track, filtering on their type
std::vector<const Trk::TrackStateOnSurface*> tsoss; std::vector<const Trk::TrackStateOnSurface*> tsoss;
for (const auto& trackState: *(trkTrack->trackStateOnSurfaces())){ for (const auto trackState: *(trkTrack->trackStateOnSurfaces())){
//Get rid of any holes that already exist -- we are doing the search again //Get rid of any holes that already exist -- we are doing the search again
if( trackState->types()[Trk::TrackStateOnSurface::Hole] ) if( trackState->types()[Trk::TrackStateOnSurface::Hole] )
continue; continue;
......
/* /*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
...@@ -93,7 +93,7 @@ namespace DerivationFramework { ...@@ -93,7 +93,7 @@ namespace DerivationFramework {
std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigma; std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigma;
std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigmaBiased; std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigmaBiased;
const xAOD::Vertex* foundVertex { nullptr }; const xAOD::Vertex* foundVertex { nullptr };
for (const auto& vx : *vertices) for (const auto vx : *vertices)
{ {
for (const auto& tpLink : vx->trackParticleLinks()) for (const auto& tpLink : vx->trackParticleLinks())
{ {
......
...@@ -35,7 +35,7 @@ StatusCode VertexDecoratorAlg::execute() { ...@@ -35,7 +35,7 @@ StatusCode VertexDecoratorAlg::execute() {
ATH_MSG_DEBUG("in execute"); ATH_MSG_DEBUG("in execute");
const xAOD::VertexContainer* Vertices = nullptr; const xAOD::VertexContainer* Vertices = nullptr;
ATH_CHECK(evtStore()->retrieve(Vertices, m_VertexContainer)); ATH_CHECK(evtStore()->retrieve(Vertices, m_VertexContainer));
for (const auto& vertex : *Vertices ){ for (const auto vertex : *Vertices ){
unsigned int n_Trks = 0; unsigned int n_Trks = 0;
float sum_pt = 0; float sum_pt = 0;
for (unsigned int t = 0 ; t < vertex->nTrackParticles(); ++t){ for (unsigned int t = 0 ; t < vertex->nTrackParticles(); ++t){
......
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