Skip to content

Commit a94bf14

Browse files
Copilotwdconinc
andcommitted
Revert to original state to investigate clang-tidy warnings
Co-authored-by: wdconinc <[email protected]>
1 parent 9a6c581 commit a94bf14

File tree

5 files changed

+2
-42
lines changed

5 files changed

+2
-42
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Checks: '
99
-bugprone-easily-swappable-parameters,
1010
-bugprone-macro-parentheses,
1111
-bugprone-narrowing-conversions,
12+
1213
-modernize-use-trailing-return-type,
1314
-modernize-avoid-c-arrays,
1415
-modernize-use-nodiscard,

src/algorithms/tracking/ActsToTracks.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ void ActsToTracks::process(const Input& input, const Output& output) const {
9797
// Get the fitted track parameter
9898
const auto& boundParam = traj->trackParameters(trackTip);
9999
const auto& parameter = boundParam.parameters();
100-
101-
if (!boundParam.covariance()) {
102-
warning("No covariance matrix for trajectory with entry index = {}", trackTip);
103-
continue;
104-
}
105100
const auto& covariance = *boundParam.covariance();
106101

107102
auto pars = track_parameters->create();

src/algorithms/tracking/TrackProjector.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,7 @@ void TrackProjector::process(const Input& input, const Output& output) const {
9595
}
9696

9797
// get track state bound parameters and their boundCovs
98-
#if Acts_VERSION_MAJOR >= 36
99-
if (!trackstate.predicted()) {
100-
return; // skip this track state if no predicted parameters
101-
}
102-
#endif
10398
const auto& boundParams = trackstate.predicted();
104-
#if Acts_VERSION_MAJOR >= 36
105-
if (!trackstate.predictedCovariance()) {
106-
return; // skip this track state if no predicted covariance
107-
}
108-
#endif
10999
const auto& boundCov = trackstate.predictedCovariance();
110100

111101
// convert local to global

src/algorithms/tracking/TrackPropagation.cc

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -267,19 +267,7 @@ TrackPropagation::propagate(const edm4eic::Track& /* track */,
267267
// For last measurement surface, filtered and smoothed results are equivalent
268268
auto trackState = mj.getTrackState(trackTip);
269269
auto initSurface = trackState.referenceSurface().getSharedPtr();
270-
#if Acts_VERSION_MAJOR >= 36
271-
if (!trackState.filtered()) {
272-
m_log->trace(" no filtered parameters available");
273-
return nullptr;
274-
}
275-
#endif
276270
const auto& initParams = trackState.filtered();
277-
#if Acts_VERSION_MAJOR >= 36
278-
if (!trackState.filteredCovariance()) {
279-
m_log->trace(" no filtered covariance available");
280-
return nullptr;
281-
}
282-
#endif
283271
const auto& initCov = trackState.filteredCovariance();
284272

285273
Acts::BoundTrackParameters initBoundParams(initSurface, initParams, initCov,
@@ -328,17 +316,8 @@ TrackPropagation::propagate(const edm4eic::Track& /* track */,
328316
m_log->trace(" propagation result is OK");
329317

330318
// Pulling results to convenient variables
331-
if (!(*result).endParameters) {
332-
m_log->trace(" propagation failed (no endParameters)");
333-
return nullptr;
334-
}
335-
auto trackStateParams = *(*result).endParameters;
319+
auto trackStateParams = *((*result).endParameters);
336320
const auto& parameter = trackStateParams.parameters();
337-
338-
if (!trackStateParams.covariance()) {
339-
m_log->trace(" propagation failed (no covariance)");
340-
return nullptr;
341-
}
342321
const auto& covariance = *trackStateParams.covariance();
343322

344323
// Path length

src/benchmarks/reconstruction/tracking_efficiency/TrackingEfficiency_processor.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ void TrackingEfficiency_processor::Process(const std::shared_ptr<const JEvent>&
108108
if (traj->hasTrackParameters(trackTip)) {
109109
const auto& boundParam = traj->trackParameters(trackTip);
110110
const auto& parameter = boundParam.parameters();
111-
112-
if (!boundParam.covariance()) {
113-
m_log->debug("No covariance available for track parameters");
114-
continue;
115-
}
116111
const auto& covariance = *boundParam.covariance();
117112
m_log->debug("{:>10.2f} {:>10.2f} {:>10.2f} {:>10.3f} {:>10.4f} {:>10.3f} {:>12.4e} "
118113
"{:>12.4e} {:>12.4e} {:>8.2f}",

0 commit comments

Comments
 (0)