Skip to content

Commit

Permalink
comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlo Varni committed Apr 9, 2024
1 parent 2e5619c commit 6dcb8f8
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
16 changes: 8 additions & 8 deletions Core/include/Acts/TrackFinding/MeasurementSelector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ class MeasurementSelector {

private:
template <typename traj_t, typename cut_value_t>
static cut_value_t VariableCut(
static cut_value_t getCut(
const typename traj_t::TrackStateProxy& trackState,
const Acts::MeasurementSelector::Config::Iterator selector,
const std::vector<cut_value_t>& cuts, const Logger& logger);

double calculateChi2(
const double* fullCalibrated, const double* fullCalibratedCovariance,
const TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Parameters predicted,
const TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Covariance predictedCovariance,
const TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Projector projector,
const unsigned int calibratedSize) const;
TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Parameters predicted,
TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Covariance predictedCovariance,
TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Projector projector,
unsigned int calibratedSize) const;

Config m_config;
};
Expand Down
12 changes: 6 additions & 6 deletions Core/include/Acts/TrackFinding/MeasurementSelector.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ MeasurementSelector::select(

assert(!cuts->chi2CutOff.empty());
const std::vector<double>& chi2CutOff = cuts->chi2CutOff;
const double maxChi2Cut = std::min(
*std::max_element(chi2CutOff.begin(), chi2CutOff.end()),
VariableCut<traj_t>(candidates.front(), cuts, chi2CutOff, logger));
const std::size_t numMeasurementsCut = VariableCut<traj_t>(
const double maxChi2Cut =
std::min(*std::max_element(chi2CutOff.begin(), chi2CutOff.end()),
getCut<traj_t>(candidates.front(), cuts, chi2CutOff, logger));
const std::size_t numMeasurementsCut = getCut<traj_t>(
candidates.front(), cuts, cuts->numMeasurementsCutOff, logger);

if (numMeasurementsCut == 0ul) {
Expand Down Expand Up @@ -129,7 +129,7 @@ MeasurementSelector::select(
}

template <typename traj_t, typename cut_value_t>
cut_value_t MeasurementSelector::VariableCut(
cut_value_t MeasurementSelector::getCut(
const typename traj_t::TrackStateProxy& trackState,
const Acts::MeasurementSelector::Config::Iterator selector,
const std::vector<cut_value_t>& cuts, const Logger& logger) {
Expand All @@ -149,7 +149,7 @@ cut_value_t MeasurementSelector::VariableCut(
if (bin >= cuts.size()) {
bin = cuts.size() - 1;
}
ACTS_VERBOSE("Variable cut for eta=" << eta << ": " << cuts[bin]);
ACTS_VERBOSE("Get cut for eta=" << eta << ": " << cuts[bin]);
return cuts[bin];
}

Expand Down
16 changes: 8 additions & 8 deletions Core/src/TrackFinding/MeasurementSelector.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is part of the Acts project.
//
// Copyright (C) 2024 CERN for the benefit of the Acts project
// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -20,13 +20,13 @@ MeasurementSelector::MeasurementSelector(Config config)

double MeasurementSelector::calculateChi2(
const double* fullCalibrated, const double* fullCalibratedCovariance,
const TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Parameters predicted,
const TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Covariance predictedCovariance,
const TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Projector projector,
const unsigned int calibratedSize) const {
TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Parameters predicted,
TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Covariance predictedCovariance,
TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
false>::Projector projector,
unsigned int calibratedSize) const {
return visit_measurement(
calibratedSize,
[&fullCalibrated, &fullCalibratedCovariance, &predicted,
Expand Down

0 comments on commit 6dcb8f8

Please sign in to comment.