resolve conflicts

AJPfleger · Oct 18, 2024 · 51d5304 · 51d5304
1 parent 3d88f37
commit 51d5304
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp
@@ -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
-  EventFraction(const ActsExamples::ExtractedSimulationProcess& event)
+  explicit EventFraction(const ActsExamples::ExtractedSimulationProcess& event)
       : initialParticle(event.initial),
         interactingParticle(event.before),
         finalParticles(event.after) {}

diff --git a/Examples/Io/Root/src/VertexPerformanceWriter.cpp b/Examples/Io/Root/src/VertexPerformanceWriter.cpp
@@ -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;
@@ -629,7 +629,8 @@ ProcessCode VertexPerformanceWriter::writeT(
       // Count number of reconstructible tracks on truth vertex
       int nTracksOnTruthVertex = 0;
       for (const auto& particle : selectedParticles) {
-        if (particle.particleId().vertexId() == truthVertex.vertexId()) {
+        if (static_cast<SimVertexBarcode>(particle.particleId().vertexId()) ==
+            truthVertex.vertexId()) {
           ++nTracksOnTruthVertex;
         }
       }