Skip to content
Snippets Groups Projects
Unverified Commit b16c531e authored by lintao@ihep.ac.cn's avatar lintao@ihep.ac.cn Committed by GitHub
Browse files

Merge pull request #265 from mirguest/master

According to comment from Thomas, use (0, 10, 5)
parents 23b80214 637085ae
No related branches found
No related tags found
No related merge requests found
......@@ -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<edm4hep::SimTrackerHit> GetRelatedTrackerHit(const edm4hep::ObjectID& id);
#else
......
......@@ -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<edm4hep::SimTrackerHit> Navigation::GetRelatedTrackerHit(const edm4hep::ObjectID& id){
#else
std::vector<edm4hep::SimTrackerHit> Navigation::GetRelatedTrackerHit(const podio::ObjectID& id){
......
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