diff --git a/JugReco/src/components/TrackFindingAlgorithm.cpp b/JugReco/src/components/TrackFindingAlgorithm.cpp index 9573a034d5ffa73f82f4026ce8cb078ca3caa6ab..52a6bacb3ef12b2c6efc4b2fd6151205c47cbaa6 100644 --- a/JugReco/src/components/TrackFindingAlgorithm.cpp +++ b/JugReco/src/components/TrackFindingAlgorithm.cpp @@ -108,9 +108,6 @@ namespace Jug::Reco { CKFOptions ckfOptions(m_geoctx, m_fieldctx, m_calibctx, m_sourcelinkSelectorCfg, Acts::LoggerWrapper{logger()}, pOptions, &(*pSurface)); - // TrackFindingAlgorithm::CKFOptions ckfOptions(ctx.geoContext, ctx.magFieldContext, ctx.calibContext, - // m_cfg.sourcelinkSelectorCfg, Acts::LoggerWrapper{logger()}, - // &(*pSurface)); debug() << "Invoke track finding seeded by truth particle " << iseed << endmsg; auto result = findTracks(*src_links, initialParams, ckfOptions); diff --git a/JugReco/src/components/TrackFindingAlgorithm.h b/JugReco/src/components/TrackFindingAlgorithm.h index 23160cec5e724981bd60b126a954ac6926651fb3..342ed5148abd0bfa428443833f9f88f2d7be31f6 100644 --- a/JugReco/src/components/TrackFindingAlgorithm.h +++ b/JugReco/src/components/TrackFindingAlgorithm.h @@ -57,7 +57,6 @@ namespace Jug::Reco { /// Track finding function that takes input measurements, initial trackstate /// and track finder options and returns some track-finding-specific result. using CKFOptions = Acts::CombinatorialKalmanFilterOptions<Acts::CKFSourceLinkSelector>; - using TrackFinderFunction = std::function<TrackFinderResult(const SourceLinkContainer&, const TrackParameters&, const CKFOptions&)>; diff --git a/JugReco/src/components/TrackerSourceLinker.cpp b/JugReco/src/components/TrackerSourceLinker.cpp index 19f47d7ddd91d639aff99e9923f416167f5c6ccb..0927d047782006423cde6308f84b25eca47c3a24 100644 --- a/JugReco/src/components/TrackerSourceLinker.cpp +++ b/JugReco/src/components/TrackerSourceLinker.cpp @@ -112,7 +112,7 @@ namespace Jug::Reco { //// smear truth to create local measurement Acts::BoundVector loc = Acts::BoundVector::Zero(); loc[Acts::eBoundLoc0] = pos[0] ;//+ m_cfg.sigmaLoc0 * stdNormal(rng); - loc[Acts::eBoundLoc0] = pos[1] ;//+ m_cfg.sigmaLoc1 * stdNormal(rng); + loc[Acts::eBoundLoc1] = pos[1] ;//+ m_cfg.sigmaLoc1 * stdNormal(rng); debug() << "loc : (" << loc[0] << ", " << loc[1] << ")" << endmsg; diff --git a/JugReco/src/components/TrackerSourcesLinker.cpp b/JugReco/src/components/TrackerSourcesLinker.cpp index 0da963be07d7d4e7f8b9901a178357d7879de61a..4f894c481b6e388f947f6b8f698e85b0557cbb1f 100644 --- a/JugReco/src/components/TrackerSourcesLinker.cpp +++ b/JugReco/src/components/TrackerSourcesLinker.cpp @@ -31,9 +31,16 @@ namespace Jug::Reco { class TrackerSourcesLinker : public GaudiAlgorithm { public: + + using HitCol = eic::TrackerHitCollection; + + DataHandle<HitCol> m_ITrackerBarrelHits{"ITrackerBarrelHits", Gaudi::DataHandle::Reader, this}; + DataHandle<HitCol> m_ITrackerEndcapHits{"ITrackerEndcapHits", Gaudi::DataHandle::Reader, this}; + DataHandle<HitCol> m_OTrackerBarrelHits{"OTrackerBarrelHits", Gaudi::DataHandle::Reader, this}; + DataHandle<HitCol> m_OTrackerEndcapHits{"OTrackerEndcapHits", Gaudi::DataHandle::Reader, this}; + Gaudi::Property<std::vector<std::string>> m_trackerHitCollections{this, "trackerHitCollections"}; DataHandle<SourceLinkContainer> m_outputSourceLinks{"outputSourceLinks", Gaudi::DataHandle::Writer, this}; - //DataHandle<> m_inputHitCollection{"inputHitCollection", Gaudi::DataHandle::Reader, this}; /// Pointer to the geometry service SmartIF<IGeoSvc> m_geoSvc; @@ -43,7 +50,10 @@ namespace Jug::Reco { public: TrackerSourcesLinker(const std::string& name, ISvcLocator* svcLoc) : GaudiAlgorithm(name, svcLoc) { - declareProperty("trackerHitCollections", m_trackerHitCollections, ""); + declareProperty("ITrackerBarrelHits", m_ITrackerBarrelHits, "Inner tracker barrel hits"); + declareProperty("ITrackerEndcapHits", m_ITrackerEndcapHits, ""); + declareProperty("OTrackerBarrelHits", m_OTrackerBarrelHits, ""); + declareProperty("OTrackerEndcapHits", m_OTrackerEndcapHits, ""); declareProperty("outputSourceLinks", m_outputSourceLinks, ""); }