Skip to content
Snippets Groups Projects
Commit ca1268b2 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Tracking fix

	modified:   TrackFindingAlgorithm.cpp
	modified:   TrackFindingAlgorithm.h
	modified:   TrackerSourceLinker.cpp
parent d9a1cdfa
Branches
Tags
1 merge request!68Tracking fix
...@@ -108,9 +108,6 @@ namespace Jug::Reco { ...@@ -108,9 +108,6 @@ namespace Jug::Reco {
CKFOptions ckfOptions(m_geoctx, m_fieldctx, m_calibctx, m_sourcelinkSelectorCfg, CKFOptions ckfOptions(m_geoctx, m_fieldctx, m_calibctx, m_sourcelinkSelectorCfg,
Acts::LoggerWrapper{logger()}, pOptions, Acts::LoggerWrapper{logger()}, pOptions,
&(*pSurface)); &(*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; debug() << "Invoke track finding seeded by truth particle " << iseed << endmsg;
auto result = findTracks(*src_links, initialParams, ckfOptions); auto result = findTracks(*src_links, initialParams, ckfOptions);
......
...@@ -58,7 +58,6 @@ namespace Jug::Reco { ...@@ -58,7 +58,6 @@ namespace Jug::Reco {
/// and track finder options and returns some track-finding-specific result. /// and track finder options and returns some track-finding-specific result.
using CKFOptions = Acts::CombinatorialKalmanFilterOptions<Acts::CKFSourceLinkSelector>; using CKFOptions = Acts::CombinatorialKalmanFilterOptions<Acts::CKFSourceLinkSelector>;
using TrackFinderFunction = using TrackFinderFunction =
std::function<TrackFinderResult(const SourceLinkContainer&, const TrackParameters&, const CKFOptions&)>; std::function<TrackFinderResult(const SourceLinkContainer&, const TrackParameters&, const CKFOptions&)>;
......
...@@ -112,7 +112,7 @@ namespace Jug::Reco { ...@@ -112,7 +112,7 @@ namespace Jug::Reco {
//// smear truth to create local measurement //// smear truth to create local measurement
Acts::BoundVector loc = Acts::BoundVector::Zero(); Acts::BoundVector loc = Acts::BoundVector::Zero();
loc[Acts::eBoundLoc0] = pos[0] ;//+ m_cfg.sigmaLoc0 * stdNormal(rng); 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; debug() << "loc : (" << loc[0] << ", " << loc[1] << ")" << endmsg;
......
...@@ -31,9 +31,16 @@ namespace Jug::Reco { ...@@ -31,9 +31,16 @@ namespace Jug::Reco {
class TrackerSourcesLinker : public GaudiAlgorithm { class TrackerSourcesLinker : public GaudiAlgorithm {
public: 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"}; Gaudi::Property<std::vector<std::string>> m_trackerHitCollections{this, "trackerHitCollections"};
DataHandle<SourceLinkContainer> m_outputSourceLinks{"outputSourceLinks", Gaudi::DataHandle::Writer, this}; DataHandle<SourceLinkContainer> m_outputSourceLinks{"outputSourceLinks", Gaudi::DataHandle::Writer, this};
//DataHandle<> m_inputHitCollection{"inputHitCollection", Gaudi::DataHandle::Reader, this};
/// Pointer to the geometry service /// Pointer to the geometry service
SmartIF<IGeoSvc> m_geoSvc; SmartIF<IGeoSvc> m_geoSvc;
...@@ -43,7 +50,10 @@ namespace Jug::Reco { ...@@ -43,7 +50,10 @@ namespace Jug::Reco {
public: public:
TrackerSourcesLinker(const std::string& name, ISvcLocator* svcLoc) TrackerSourcesLinker(const std::string& name, ISvcLocator* svcLoc)
: GaudiAlgorithm(name, 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, ""); declareProperty("outputSourceLinks", m_outputSourceLinks, "");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment