diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx index 791cfcb867706a53ed60e7f1c16b68873fc6be46..f5cbd021646720b640ec67ddf714de54665dde8f 100644 --- a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx +++ b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx @@ -41,7 +41,7 @@ void ATKFParticleFinder::InitOutput(const std::string& file_name) { ParticlesRecoBranch.AddField<int>("daughter2id"); out_config_.AddBranchConfig(ParticlesRecoBranch); - particles_reco_ = new AnalysisTree::Particles(out_config_.GetLastId()); + particles_reco_ = new AnalysisTree::Particles(out_config_.GetBranchConfig("ParticlesReconstructed").GetId()); out_tree_ = new TTree("aTree", "AnalysisTree ParticlesReco"); out_tree_->Branch( @@ -173,9 +173,7 @@ void ATKFParticleFinder::WriteCandidates( const KFParticleTopoReconstructor* eventTR) { particles_reco_->ClearChannels(); - for (unsigned int iP = 0; iP < eventTR->GetParticles().size(); iP++) { - const KFParticle& particle = eventTR->GetParticles()[iP]; - + for (const auto & particle : eventTR->GetParticles()) { auto* particlerec = particles_reco_->AddChannel(); particlerec->Init(out_config_.GetBranchConfig(particles_reco_->GetId())); diff --git a/external/InstallAnalysisTree.cmake b/external/InstallAnalysisTree.cmake index 48c178c2f7a89dcc1dd2c0ebfb8bab4aaced5854..170327c0d8841bf156d15e6710aae6020a15e626 100644 --- a/external/InstallAnalysisTree.cmake +++ b/external/InstallAnalysisTree.cmake @@ -1,4 +1,4 @@ -set(ANALYSISTREE_VERSION 9f49db8c1cd0cd1079a3f9267358a9a7362bde41) +set(ANALYSISTREE_VERSION v2.1.0) set(ANALYSISTREE_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTree.git") set(ANALYSISTREE_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREE-prefix") diff --git a/external/InstallAnalysisTreeQA.cmake b/external/InstallAnalysisTreeQA.cmake index 1376465a1a9d2ee450497c5962e01a8ad6755ebf..113718511112eaa7849d8f41c3134f3cfb1340b2 100644 --- a/external/InstallAnalysisTreeQA.cmake +++ b/external/InstallAnalysisTreeQA.cmake @@ -1,4 +1,4 @@ -set(ANALYSISTREEQA_VERSION be56549d0ee90b628e1ec49131924a03982365d6) +set(ANALYSISTREEQA_VERSION v2.0.0) set(ANALYSISTREEQA_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTreeQA.git") set(ANALYSISTREEQA_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREEQA-prefix")