Skip to content

Commit

Permalink
revert conflicting files
Browse files Browse the repository at this point in the history
  • Loading branch information
AJPfleger committed Oct 18, 2024
1 parent 672aa9c commit 19a9919
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct EventFraction {
///
/// @param [in] event Tuple containing the initial particle, the particle
/// before the interaction and all final state particles after the interaction
explicit EventFraction(const ActsExamples::ExtractedSimulationProcess& event)
EventFraction(const ActsExamples::ExtractedSimulationProcess& event)
: initialParticle(event.initial),
interactingParticle(event.before),
finalParticles(event.after) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ ProcessCode VertexPerformanceWriter::writeT(
fmap[vtxId].second += weight;
}
double truthMajorityVertexTrackWeights = 0;
SimVertexBarcode truthMajorityVertexId{0};
SimVertexBarcode truthMajorityVertexId = 0;
for (const auto& [vtxId, counter] : fmap) {
if (counter.second > truthMajorityVertexTrackWeights) {
truthMajorityVertexId = vtxId;
Expand Down Expand Up @@ -629,8 +629,7 @@ ProcessCode VertexPerformanceWriter::writeT(
// Count number of reconstructible tracks on truth vertex
int nTracksOnTruthVertex = 0;
for (const auto& particle : selectedParticles) {
if (static_cast<SimVertexBarcode>(particle.particleId().vertexId()) ==
truthVertex.vertexId()) {
if (particle.particleId().vertexId() == truthVertex.vertexId()) {
++nTracksOnTruthVertex;
}
}
Expand Down

0 comments on commit 19a9919

Please sign in to comment.