From ca1268b2fa59d37f45d9f211f96d8573702848ea Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 5 Jan 2021 22:52:45 -0600
Subject: [PATCH] Tracking fix modified: TrackFindingAlgorithm.cpp
modified: TrackFindingAlgorithm.h modified: TrackerSourceLinker.cpp
---
JugReco/src/components/TrackFindingAlgorithm.cpp | 3 ---
JugReco/src/components/TrackFindingAlgorithm.h | 1 -
JugReco/src/components/TrackerSourceLinker.cpp | 2 +-
JugReco/src/components/TrackerSourcesLinker.cpp | 14 ++++++++++++--
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/JugReco/src/components/TrackFindingAlgorithm.cpp b/JugReco/src/components/TrackFindingAlgorithm.cpp
index 9573a034..52a6bacb 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 23160cec..342ed514 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 19f47d7d..0927d047 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 0da963be..4f894c48 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, "");
}
--
GitLab