From 17b99c4efc5db6d587726a37cd65ca790867dbda Mon Sep 17 00:00:00 2001
From: Viktor <klochkov44@gmail.com>
Date: Thu, 25 Mar 2021 16:31:56 +0100
Subject: [PATCH] update AT version
---
analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx | 6 ++----
external/InstallAnalysisTree.cmake | 2 +-
external/InstallAnalysisTreeQA.cmake | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
index 791cfcb867..f5cbd02164 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 48c178c2f7..170327c0d8 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 1376465a1a..1137185111 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")
--
GitLab