Skip to content

Commit 658e0ac

Browse files
madbaronclaude
madbaron
and
claude
committed
Apply clang-format
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent aede5d9 commit 658e0ac

2 files changed

Lines changed: 40 additions & 49 deletions

File tree

‎k4ActsTracking/include/k4ActsTracking/CKFRunner.hxx‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ namespace ACTSTracking {
8282
Acts::TrackContainer<Acts::VectorTrackContainer, Acts::VectorMultiTrajectory, std::shared_ptr>;
8383
using CKFTrackFinderOptions = Acts::CombinatorialKalmanFilterOptions<CKFTrackContainer>;
8484

85-
using CKFStepper = Acts::EigenStepper<>;
86-
using CKFNavigator = Acts::Navigator;
87-
using CKFPropagator = Acts::Propagator<CKFStepper, CKFNavigator>;
85+
using CKFStepper = Acts::EigenStepper<>;
86+
using CKFNavigator = Acts::Navigator;
87+
using CKFPropagator = Acts::Propagator<CKFStepper, CKFNavigator>;
8888
using CombKalmanFilter = Acts::CombinatorialKalmanFilter<CKFPropagator, CKFTrackContainer>;
8989
using KalmanFitter = Acts::KalmanFitter<CKFPropagator, Acts::VectorMultiTrajectory>;
9090

@@ -217,10 +217,12 @@ namespace ACTSTracking {
217217
* original behaviour.
218218
*/
219219
template <class Alg>
220-
std::optional<Acts::BoundTrackParameters>
221-
estimateSeedParameters(const Alg& alg, const IActsGeoSvc& geo, const Acts::GeometryContext& geoCtx,
222-
const SeedSpacePointSeed& seed, Acts::MagneticFieldProvider::Cache& magCache, double errPos,
223-
double errPhi, double errLambda, double errRelP, double errTime) {
220+
std::optional<Acts::BoundTrackParameters> estimateSeedParameters(const Alg& alg, const IActsGeoSvc& geo,
221+
const Acts::GeometryContext& geoCtx,
222+
const SeedSpacePointSeed& seed,
223+
Acts::MagneticFieldProvider::Cache& magCache,
224+
double errPos, double errPhi, double errLambda,
225+
double errRelP, double errTime) {
224226
const ACTSTracking::SeedSpacePoint* bottomSP = seed.sp().front();
225227
const auto& sourceLink = bottomSP->sourceLink();
226228
const Acts::GeometryIdentifier& geoId = sourceLink.geometryId();
@@ -247,8 +249,7 @@ namespace ACTSTracking {
247249
const Acts::BoundVector& params = *optParams;
248250
float p = std::abs(1.f / params[Acts::eBoundQOverP]);
249251

250-
Acts::BoundMatrix cov =
251-
ACTSTracking::makeInitialCovariance(p, errPos, errPhi, errLambda, errRelP, errTime);
252+
Acts::BoundMatrix cov = ACTSTracking::makeInitialCovariance(p, errPos, errPhi, errLambda, errRelP, errTime);
252253

253254
return Acts::BoundTrackParameters(surface->getSharedPtr(), params, cov, Acts::ParticleHypothesis::pion());
254255
}
@@ -261,8 +262,8 @@ namespace ACTSTracking {
261262
const Acts::GeometryContext& geoCtx,
262263
const Acts::BoundTrackParameters& paramseed,
263264
Acts::MagneticFieldProvider::Cache& magCache) {
264-
const Acts::Surface& surface = paramseed.referenceSurface();
265-
const Acts::BoundVector& params = paramseed.parameters();
265+
const Acts::Surface& surface = paramseed.referenceSurface();
266+
const Acts::BoundVector& params = paramseed.parameters();
266267

267268
Acts::Vector3 globalPos =
268269
surface.localToGlobal(geoCtx, {params[Acts::eBoundLoc0], params[Acts::eBoundLoc1]}, {0, 0, 0});
@@ -291,21 +292,18 @@ namespace ACTSTracking {
291292
class CKFRunner {
292293
public:
293294
struct Config {
294-
double chi2CutOff = 15;
295+
double chi2CutOff = 15;
295296
std::int32_t numMeasurementsCutOff = 10;
296-
bool propagateBackward = false;
297-
std::size_t maxSteps = 10000;
297+
bool propagateBackward = false;
298+
std::size_t maxSteps = 10000;
298299
};
299300

300301
/// @param measurements Event-local measurement container; must outlive the runner.
301302
/// @param sourceLinks Event-local source-link container; must outlive the runner.
302303
CKFRunner(const IActsGeoSvc& geo, const Acts::GeometryContext& geoCtx, const Acts::MagneticFieldContext& magCtx,
303304
const Acts::CalibrationContext& calCtx, const ACTSTracking::MeasurementContainer& measurements,
304305
const ACTSTracking::SourceLinkContainer& sourceLinks, const Config& cfg)
305-
: m_geo(geo),
306-
m_geoCtx(geoCtx),
307-
m_measSel(makeSelectorConfig(cfg)),
308-
m_measCal(measurements) {
306+
: m_geo(geo), m_geoCtx(geoCtx), m_measSel(makeSelectorConfig(cfg)), m_measCal(measurements) {
309307
CKFNavigator::Config navigatorCfg{geo.trackingGeometry()};
310308
navigatorCfg.resolvePassive = false;
311309
navigatorCfg.resolveMaterial = true;
@@ -342,8 +340,7 @@ namespace ACTSTracking {
342340
pOptions.direction = Acts::Direction::Backward();
343341
}
344342

345-
m_ckfOptions =
346-
std::make_unique<CKFTrackFinderOptions>(geoCtx, magCtx, calCtx, m_extensions, pOptions);
343+
m_ckfOptions = std::make_unique<CKFTrackFinderOptions>(geoCtx, magCtx, calCtx, m_extensions, pOptions);
347344
}
348345

349346
CKFRunner(const CKFRunner&) = delete;
@@ -381,9 +378,8 @@ namespace ACTSTracking {
381378
// defined there, not at the innermost measurement surface.
382379
typename CKFPropagator::template Options<> exOptions(m_geoCtx, m_magCtx);
383380
exOptions.maxSteps = m_maxSteps;
384-
auto exResult = Acts::extrapolateTrackToReferenceSurface(
385-
trackTip, *m_perigee, *m_extrapolator, exOptions,
386-
Acts::TrackExtrapolationStrategy::firstOrLast);
381+
auto exResult = Acts::extrapolateTrackToReferenceSurface(trackTip, *m_perigee, *m_extrapolator, exOptions,
382+
Acts::TrackExtrapolationStrategy::firstOrLast);
387383
if (!exResult.ok()) {
388384
alg.warning() << "IP extrapolation error: " << exResult.error() << endmsg;
389385
continue;
@@ -406,14 +402,14 @@ namespace ACTSTracking {
406402
Acts::TrackStateCreator<ACTSTracking::SourceLinkAccessor::Iterator, CKFTrackContainer>;
407403

408404
static Acts::MeasurementSelector::Config makeSelectorConfig(const Config& cfg) {
409-
return {{Acts::GeometryIdentifier(),
410-
{{}, {cfg.chi2CutOff}, {static_cast<std::size_t>(cfg.numMeasurementsCutOff)}}}};
405+
return {
406+
{Acts::GeometryIdentifier(), {{}, {cfg.chi2CutOff}, {static_cast<std::size_t>(cfg.numMeasurementsCutOff)}}}};
411407
}
412408

413-
const IActsGeoSvc& m_geo;
414-
Acts::GeometryContext m_geoCtx;
415-
Acts::MagneticFieldContext m_magCtx;
416-
std::size_t m_maxSteps = 10000;
409+
const IActsGeoSvc& m_geo;
410+
Acts::GeometryContext m_geoCtx;
411+
Acts::MagneticFieldContext m_magCtx;
412+
std::size_t m_maxSteps = 10000;
417413

418414
Acts::GainMatrixUpdater m_kfUpdater;
419415
Acts::MeasurementSelector m_measSel;
@@ -495,14 +491,13 @@ namespace ACTSTracking {
495491
/// @return The fitted edm4hep track, or std::nullopt if the fit failed.
496492
template <class Alg>
497493
std::optional<edm4hep::MutableTrack> fit(const Alg& alg, const std::vector<Acts::SourceLink>& sourceLinks,
498-
const Acts::BoundTrackParameters& initialParameters,
494+
const Acts::BoundTrackParameters& initialParameters,
499495
Acts::MagneticFieldProvider::Cache& magCache) const {
500496
auto trackContainer = std::make_shared<Acts::VectorTrackContainer>();
501497
auto trackStateContainer = std::make_shared<Acts::VectorMultiTrajectory>();
502498
CKFTrackContainer tracks(trackContainer, trackStateContainer);
503499

504-
auto result =
505-
m_fitter->fit(sourceLinks.begin(), sourceLinks.end(), initialParameters, *m_kfOptions, tracks);
500+
auto result = m_fitter->fit(sourceLinks.begin(), sourceLinks.end(), initialParameters, *m_kfOptions, tracks);
506501
if (!result.ok()) {
507502
alg.warning() << "Kalman fit error: " << result.error() << endmsg;
508503
return std::nullopt;
@@ -524,7 +519,7 @@ namespace ACTSTracking {
524519

525520
Acts::KalmanFitterExtensions<Acts::VectorMultiTrajectory> m_extensions;
526521

527-
std::unique_ptr<KalmanFitter> m_fitter;
522+
std::unique_ptr<KalmanFitter> m_fitter;
528523
std::unique_ptr<Acts::KalmanFitterOptions<Acts::VectorMultiTrajectory>> m_kfOptions;
529524
};
530525

‎k4ActsTracking/src/components/CKFTrackingFromSeedsAlg.cpp‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ using namespace Acts::UnitLiterals;
8181
struct CKFTrackingFromSeedsAlg final
8282
: k4FWCore::MultiTransformer<std::tuple<edm4hep::TrackCollection, edm4hep::TrackCollection>(
8383
const edm4hep::TrackerHitPlaneCollection&, const edm4hep::TrackCollection&)> {
84-
8584
CKFTrackingFromSeedsAlg(const std::string& name, ISvcLocator* svcLoc);
8685

8786
StatusCode initialize() override;
@@ -100,15 +99,15 @@ struct CKFTrackingFromSeedsAlg final
10099

101100
/// @name Track-fit initial error estimates
102101
///@{
103-
Gaudi::Property<double> m_initialTrackError_pos{this, "InitialTrackError_Pos", 10 * Acts::UnitConstants::um,
102+
Gaudi::Property<double> m_initialTrackError_pos{this, "InitialTrackError_Pos", 10 * Acts::UnitConstants::um,
104103
"Initial track error for local position."};
105-
Gaudi::Property<double> m_initialTrackError_phi{this, "InitialTrackError_Phi", 1 * Acts::UnitConstants::degree,
104+
Gaudi::Property<double> m_initialTrackError_phi{this, "InitialTrackError_Phi", 1 * Acts::UnitConstants::degree,
106105
"Initial track error for phi."};
107-
Gaudi::Property<double> m_initialTrackError_relP{this, "InitialTrackError_RelP", 0.25,
106+
Gaudi::Property<double> m_initialTrackError_relP{this, "InitialTrackError_RelP", 0.25,
108107
"Initial track error for momentum (relative)."};
109-
Gaudi::Property<double> m_initialTrackError_lambda{this, "InitialTrackError_Lambda", 1 * Acts::UnitConstants::degree,
108+
Gaudi::Property<double> m_initialTrackError_lambda{this, "InitialTrackError_Lambda", 1 * Acts::UnitConstants::degree,
110109
"Initial track error for lambda."};
111-
Gaudi::Property<double> m_initialTrackError_time{this, "InitialTrackError_Time", 100 * Acts::UnitConstants::ns,
110+
Gaudi::Property<double> m_initialTrackError_time{this, "InitialTrackError_Time", 100 * Acts::UnitConstants::ns,
112111
"Initial track error for time."};
113112
Gaudi::Property<double> m_CKF_chi2CutOff{this, "CKF_Chi2CutOff", 15, "Maximum local chi2 contribution."};
114113
Gaudi::Property<int32_t> m_CKF_numMeasurementsCutOff{this, "CKF_NumMeasurementsCutOff", 10,
@@ -136,8 +135,7 @@ CKFTrackingFromSeedsAlg::CKFTrackingFromSeedsAlg(const std::string& name, ISvcLo
136135
: MultiTransformer(name, svcLoc,
137136
{KeyValue("InputTrackerHitCollection", "TrackerHits"),
138137
KeyValue("InputSeedTrackCollection", "SeedTrackCandidates")},
139-
{KeyValue("OutputSeedCollection", "SeedTracks"),
140-
KeyValue("OutputTrackCollection", "Tracks")}) {}
138+
{KeyValue("OutputSeedCollection", "SeedTracks"), KeyValue("OutputTrackCollection", "Tracks")}) {}
141139

142140
StatusCode CKFTrackingFromSeedsAlg::initialize() {
143141
m_actsGeoSvc = svcLoc()->service<IActsGeoSvc>("ActsGeoSvc");
@@ -175,8 +173,8 @@ std::tuple<edm4hep::TrackCollection, edm4hep::TrackCollection> CKFTrackingFromSe
175173
spByHit.emplace(ACTSTracking::trackerHitKey(hit), sp);
176174
});
177175

178-
debug() << fmt::format("Created {} sourceLinks and {} space points from {} hits", sourceLinks.size(),
179-
spByHit.size(), trackerHitCollection.size())
176+
debug() << fmt::format("Created {} sourceLinks and {} space points from {} hits", sourceLinks.size(), spByHit.size(),
177+
trackerHitCollection.size())
180178
<< endmsg;
181179

182180
// Shared Combinatorial Kalman Filter. const and safe to share across threads
@@ -219,10 +217,9 @@ std::tuple<edm4hep::TrackCollection, edm4hep::TrackCollection> CKFTrackingFromSe
219217
}
220218

221219
// Order by radius and pick innermost / middle / outermost as the seed triplet.
222-
std::sort(sps.begin(), sps.end(),
223-
[](const ACTSTracking::SeedSpacePoint* a, const ACTSTracking::SeedSpacePoint* b) {
224-
return a->r() < b->r();
225-
});
220+
std::sort(
221+
sps.begin(), sps.end(),
222+
[](const ACTSTracking::SeedSpacePoint* a, const ACTSTracking::SeedSpacePoint* b) { return a->r() < b->r(); });
226223
const ACTSTracking::SeedSpacePointSeed seed(*sps.front(), *sps[sps.size() / 2], *sps.back());
227224

228225
std::optional<Acts::BoundTrackParameters> paramseed = ACTSTracking::estimateSeedParameters(
@@ -233,8 +230,7 @@ std::tuple<edm4hep::TrackCollection, edm4hep::TrackCollection> CKFTrackingFromSe
233230
}
234231
paramseeds.push_back(*paramseed);
235232

236-
auto seedTrackState =
237-
ACTSTracking::makeSeedTrackState(*this, *m_actsGeoSvc, geoCtx, *paramseed, magCacheLocal);
233+
auto seedTrackState = ACTSTracking::makeSeedTrackState(*this, *m_actsGeoSvc, geoCtx, *paramseed, magCacheLocal);
238234

239235
{
240236
std::lock_guard<std::mutex> lock(m_seedMutex);

0 commit comments

Comments
 (0)