diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp index 74ed5f2203bd2c85b0552bd23f750473f056a290..7a609a3dd6d5db350d798501da78bd01f9ddf0a1 100644 --- a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp +++ b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp @@ -2,7 +2,7 @@ #include "GearSvc/IGearSvc.h" #include "EventSeeder/IEventSeeder.h" #include "TrackSystemSvc/ITrackSystemSvc.h" -#include "DataHelper/Navagation.h" +#include "DataHelper/Navigation.h" #include "edm4hep/MCParticle.h" #include "edm4hep/TrackerHit.h" //#include "edm4hep/TrackerHitPlane.h" @@ -156,7 +156,7 @@ StatusCode SiliconTrackingAlg::initialize() { } StatusCode SiliconTrackingAlg::execute(){ - Navagation::Instance()->Initialize(); + Navigation::Instance()->Initialize(); //_current_event = evt; //_allHits.reserve(1000); @@ -538,7 +538,7 @@ int SiliconTrackingAlg::InitialiseFTD() { } if(hitFTDSpacePointCol&&rawHitCol){ - Navagation::Instance()->AddTrackerHitCollection(rawHitCol); + Navigation::Instance()->AddTrackerHitCollection(rawHitCol); //LCCollection * hitCollection = evt->getCollection(_FTDSpacePointCollection.c_str()); //_colNamesTrackerHits[hitCollection] = _FTDSpacePointCollection; @@ -746,7 +746,7 @@ int SiliconTrackingAlg::InitialiseVTX() { } if(hitSITCol){ - if(rawHitCol) Navagation::Instance()->AddTrackerHitCollection(rawHitCol); + if(rawHitCol) Navigation::Instance()->AddTrackerHitCollection(rawHitCol); //debug() << "SITHitCollection pointer = " << hitSITCol << endmsg; int nelem = hitSITCol->size(); diff --git a/Service/TrackSystemSvc/src/MarlinTrkUtils.cc b/Service/TrackSystemSvc/src/MarlinTrkUtils.cc index cf8ae82be5959a68618a5a1dc3de3c0f97afec0f..f28442a27eb1a9e30fde81cbdd5f00c89ff77d55 100644 --- a/Service/TrackSystemSvc/src/MarlinTrkUtils.cc +++ b/Service/TrackSystemSvc/src/MarlinTrkUtils.cc @@ -6,7 +6,7 @@ #include "TrackSystemSvc/IMarlinTrack.h" #include "TrackSystemSvc/HelixTrack.h" -#include "DataHelper/Navagation.h" +#include "DataHelper/Navigation.h" //#include "lcio.h" //#include <IMPL/TrackImpl.h> //#include <IMPL/TrackStateImpl.h> @@ -223,7 +223,7 @@ namespace MarlinTrk { //exit(1); int nRawHit = trkHit->rawHits_size(); for( unsigned k=0; k< nRawHit; k++ ){ - edm4hep::TrackerHit* rawHit = Navagation::Instance()->GetTrackerHit(trkHit->getRawHits(k)); + edm4hep::TrackerHit* rawHit = Navigation::Instance()->GetTrackerHit(trkHit->getRawHits(k)); if( marlinTrk->addHit( rawHit ) == IMarlinTrack::success ){ isSuccessful = true; //if at least one hit from the spacepoint gets added ++ndof_added; @@ -431,7 +431,7 @@ namespace MarlinTrk { // get strip hits int nRawHit = trkHit->rawHits_size(); for( unsigned k=0; k< nRawHit; k++ ){ - edm4hep::TrackerHit* rawHit = Navagation::Instance()->GetTrackerHit(trkHit->getRawHits(k)); + edm4hep::TrackerHit* rawHit = Navigation::Instance()->GetTrackerHit(trkHit->getRawHits(k)); bool is_outlier = false; // here we loop over outliers as this will be faster than looping over the used hits for ( unsigned ohit = 0; ohit < outliers.size(); ++ohit) { diff --git a/Utilities/DataHelper/DataHelper/Navagation.h b/Utilities/DataHelper/DataHelper/Navigation.h similarity index 85% rename from Utilities/DataHelper/DataHelper/Navagation.h rename to Utilities/DataHelper/DataHelper/Navigation.h index 5598dda122ce292356c19499d62f58d285045978..238dd30ee280ae938208d4565c0e5231ab7cccff 100644 --- a/Utilities/DataHelper/DataHelper/Navagation.h +++ b/Utilities/DataHelper/DataHelper/Navigation.h @@ -1,5 +1,5 @@ -#ifndef Navagation_h -#define Navagation_h +#ifndef Navigation_h +#define Navigation_h //#include "FWCore/DataHandle.h" //#include "podio/CollectionBase.h" @@ -7,12 +7,12 @@ #include "edm4hep/TrackerHitCollection.h" #include <map> -class Navagation{ +class Navigation{ public: - static Navagation* Instance(); + static Navigation* Instance(); - Navagation(); - ~Navagation(); + Navigation(); + ~Navigation(); void Initialize(); //void AddDataHandle(DataHandle* hdl){if(hdl)m_hdlVec.push_back(hdl);}; @@ -23,9 +23,9 @@ class Navagation{ std::vector<edm4hep::ConstSimTrackerHit> GetRelatedTrackerHit(const edm4hep::ObjectID& id); std::vector<edm4hep::ConstSimTrackerHit> GetRelatedTrackerHit(const edm4hep::TrackerHit& hit); - //static Navagation* m_fNavagation; + //static Navigation* m_fNavigation; private: - static Navagation* m_fNavagation; + static Navigation* m_fNavigation; //DataHandle<edm4hep::MCRecoTrackerAssociationCollection> _inHitAssColHdl{"FTDStripTrackerHitsAssociation", Gaudi::DataHandle::Reader, this}; std::vector<const edm4hep::TrackerHitCollection*> m_hitColVec; std::vector<const edm4hep::MCRecoTrackerAssociationCollection*> m_assColVec; diff --git a/Utilities/DataHelper/src/Navagation.cpp b/Utilities/DataHelper/src/Navigation.cpp similarity index 80% rename from Utilities/DataHelper/src/Navagation.cpp rename to Utilities/DataHelper/src/Navigation.cpp index ff265a53b3f32a9b777b6d8776bcd83206c94cac..4c220906aab7cc0db0226d74a8a5b1a70d0d77f5 100644 --- a/Utilities/DataHelper/src/Navagation.cpp +++ b/Utilities/DataHelper/src/Navigation.cpp @@ -1,22 +1,22 @@ -#include "DataHelper/Navagation.h" +#include "DataHelper/Navigation.h" #include "edm4hep/SimTrackerHit.h" #include "edm4hep/TrackerHit.h" -Navagation* Navagation::m_fNavagation = nullptr; +Navigation* Navigation::m_fNavigation = nullptr; -Navagation* Navagation::Instance(){ - if(!m_fNavagation) m_fNavagation = new Navagation(); - return m_fNavagation; +Navigation* Navigation::Instance(){ + if(!m_fNavigation) m_fNavigation = new Navigation(); + return m_fNavigation; } -Navagation::Navagation(){ +Navigation::Navigation(){ } -Navagation::~Navagation(){ +Navigation::~Navigation(){ } -void Navagation::Initialize(){ +void Navigation::Initialize(){ m_hitColVec.clear(); m_assColVec.clear(); for(std::map<int, edm4hep::TrackerHit*>::iterator it=m_trkHits.begin();it!=m_trkHits.end();it++){ @@ -25,7 +25,7 @@ void Navagation::Initialize(){ m_trkHits.clear(); } -edm4hep::TrackerHit* Navagation::GetTrackerHit(const edm4hep::ObjectID& obj_id, bool delete_by_caller){ +edm4hep::TrackerHit* Navigation::GetTrackerHit(const edm4hep::ObjectID& obj_id, bool delete_by_caller){ int id = obj_id.collectionID * 10000000 + obj_id.index; if(!delete_by_caller){ if(m_trkHits.find(id)!=m_trkHits.end()) return m_trkHits[id]; @@ -57,7 +57,7 @@ edm4hep::TrackerHit* Navagation::GetTrackerHit(const edm4hep::ObjectID& obj_id, throw std::runtime_error("Not found TrackerHit"); } -std::vector<edm4hep::ConstSimTrackerHit> Navagation::GetRelatedTrackerHit(const edm4hep::ObjectID& id){ +std::vector<edm4hep::ConstSimTrackerHit> Navigation::GetRelatedTrackerHit(const edm4hep::ObjectID& id){ std::vector<edm4hep::ConstSimTrackerHit> hits; for(int i=0;i<m_assColVec.size();i++){ for(auto ass : *m_assColVec[i]){ @@ -69,7 +69,7 @@ std::vector<edm4hep::ConstSimTrackerHit> Navagation::GetRelatedTrackerHit(const return hits; } -std::vector<edm4hep::ConstSimTrackerHit> Navagation::GetRelatedTrackerHit(const edm4hep::TrackerHit& hit){ +std::vector<edm4hep::ConstSimTrackerHit> Navigation::GetRelatedTrackerHit(const edm4hep::TrackerHit& hit){ std::vector<edm4hep::ConstSimTrackerHit> hits; for(int i=0;i<m_assColVec.size();i++){ for(auto ass : *m_assColVec[i]){