From 637085aea3c56ad4d1ca8ced770fb95763c2c6c6 Mon Sep 17 00:00:00 2001 From: lintao Date: Thu, 22 Feb 2024 21:51:47 +0800 Subject: [PATCH] According to comment from Thomas, use (0, 10, 5) --- Utilities/DataHelper/include/DataHelper/Navigation.h | 2 +- Utilities/DataHelper/src/Navigation.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Utilities/DataHelper/include/DataHelper/Navigation.h b/Utilities/DataHelper/include/DataHelper/Navigation.h index 6d641a1c0..6fbf6cca0 100644 --- a/Utilities/DataHelper/include/DataHelper/Navigation.h +++ b/Utilities/DataHelper/include/DataHelper/Navigation.h @@ -26,7 +26,7 @@ class Navigation{ void AddTrackerHitCollection(const edm4hep::TrackerHitCollection* col){m_hitColVec.push_back(col);}; void AddTrackerAssociationCollection(const edm4hep::MCRecoTrackerAssociationCollection* col){m_assColVec.push_back(col);}; -#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10, 4) +#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10, 5) edm4hep::TrackerHit GetTrackerHit(const edm4hep::ObjectID& id, bool delete_by_caller=true); std::vector GetRelatedTrackerHit(const edm4hep::ObjectID& id); #else diff --git a/Utilities/DataHelper/src/Navigation.cpp b/Utilities/DataHelper/src/Navigation.cpp index ff86af1f4..a7ba56f92 100644 --- a/Utilities/DataHelper/src/Navigation.cpp +++ b/Utilities/DataHelper/src/Navigation.cpp @@ -25,7 +25,7 @@ void Navigation::Initialize(){ m_trkHits.clear(); } -#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10, 4) +#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10, 5) edm4hep::TrackerHit Navigation::GetTrackerHit(const edm4hep::ObjectID& obj_id, bool delete_by_caller){ #else edm4hep::TrackerHit Navigation::GetTrackerHit(const podio::ObjectID& obj_id, bool delete_by_caller){ @@ -61,7 +61,7 @@ edm4hep::TrackerHit Navigation::GetTrackerHit(const podio::ObjectID& obj_id, boo throw std::runtime_error("Not found TrackerHit"); } -#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10, 4) +#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10, 5) std::vector Navigation::GetRelatedTrackerHit(const edm4hep::ObjectID& id){ #else std::vector Navigation::GetRelatedTrackerHit(const podio::ObjectID& id){