reduce diff

Author: paulgessinger

Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleWriter.hpp

@@ -152,15 +152,6 @@ class RootParticleWriter final : public WriterT<SimParticleContainer> {
   std::vector<std::int32_t> m_numberOfHits;
   /// Particle outcome
   std::vector<std::uint32_t> m_outcome;
-
-  /// Job-wide counters for conditions that would otherwise be logged per
-  /// particle. Summarised in @c finalize. Protected by @c m_writeMutex.
-  std::size_t m_nTotal = 0;
-  std::size_t m_nCharged = 0;
-  std::size_t m_nNonFinite = 0;
-  std::size_t m_nZeroCharge = 0;
-  std::size_t m_nGlobalToLocalFailed = 0;
-  std::size_t m_nPropagationFailed = 0;
 };
 
 }  // namespace ActsExamples

Examples/Io/Root/src/RootParticleWriter.cpp

@@ -111,27 +111,6 @@ ProcessCode RootParticleWriter::finalize() {
   ACTS_INFO("Wrote particles to tree '" << m_cfg.treeName << "' in '"
                                         << m_cfg.filePath << "'");
 
-  if (m_nNonFinite > 0) {
-    ACTS_WARNING(m_nNonFinite << " / " << m_nTotal
-                              << " particle(s) had non-finite mass or charge");
-  }
-  if (m_nZeroCharge > 0) {
-    ACTS_WARNING(m_nZeroCharge
-                 << " / " << m_nTotal
-                 << " zero-charge particle(s) linearly extrapolated to "
-                    "perigee");
-  }
-  if (m_nGlobalToLocalFailed > 0) {
-    ACTS_ERROR(m_nGlobalToLocalFailed
-               << " / " << m_nZeroCharge
-               << " global-to-local transformation(s) failed");
-  }
-  if (m_nPropagationFailed > 0) {
-    ACTS_ERROR(m_nPropagationFailed
-               << " / " << m_nCharged
-               << " propagation(s) to perigee surface failed");
-  }
-
   return ProcessCode::SUCCESS;
 }
 
@@ -142,7 +121,6 @@ ProcessCode RootParticleWriter::writeT(const AlgorithmContext& ctx,
 
   m_eventId = ctx.eventNumber;
   for (const auto& particle : particles) {
-    ++m_nTotal;
     m_particleHash.push_back(particle.particleId().hash());
     m_particleType.push_back(particle.pdg());
     m_process.push_back(static_cast<std::uint32_t>(particle.process()));
@@ -158,7 +136,7 @@ ProcessCode RootParticleWriter::writeT(const AlgorithmContext& ctx,
 
     // particle constants
     if (!std::isfinite(particle.mass()) || !std::isfinite(particle.charge())) {
-      ++m_nNonFinite;
+      ACTS_WARNING("Particle mass or charge is not finite, can't write it");
     }
 
     m_m.push_back(
@@ -219,7 +197,8 @@ ProcessCode RootParticleWriter::writeT(const AlgorithmContext& ctx,
 
     // Neutral particles have no helix -> linearly extrapolate to perigee
     if (particle.charge() == 0) {
-      ++m_nZeroCharge;
+      ACTS_WARNING(
+          "Particle has zero charge, linearly extrapolating to perigee");
       // Initialize the truth particle info
       auto perigeeD0 = NaNfloat;
       auto perigeeZ0 = NaNfloat;
@@ -233,7 +212,7 @@ ProcessCode RootParticleWriter::writeT(const AlgorithmContext& ctx,
         perigeeD0 = lpResult.value()[Acts::BoundIndices::eBoundLoc0];
         perigeeZ0 = lpResult.value()[Acts::BoundIndices::eBoundLoc1];
       } else {
-        ++m_nGlobalToLocalFailed;
+        ACTS_ERROR("Global to local transformation did not succeed.");
       }
       // truth parameters at perigee are the same as at production vertex
       m_perigeePhi.push_back(Acts::clampValue<float>(particle.phi()));
@@ -258,7 +237,6 @@ ProcessCode RootParticleWriter::writeT(const AlgorithmContext& ctx,
       continue;
     }
 
-    ++m_nCharged;
     // Charged particles: propagate helix to perigee
     // Build a propagator and propagate the *truth parameters* to the
     // perigee Stepper + propagator
@@ -283,7 +261,7 @@ ProcessCode RootParticleWriter::writeT(const AlgorithmContext& ctx,
     // Do the propagation to the perigee surface
     auto propRes = propagator->propagate(startParams, *pSurface, pOptions);
     if (!propRes.ok() || !propRes->endParameters.has_value()) {
-      ++m_nPropagationFailed;
+      ACTS_ERROR("Propagation to perigee surface failed.");
       m_perigeePhi.push_back(NaNfloat);
       m_perigeeTheta.push_back(NaNfloat);
       m_perigeeQop.push_back(NaNfloat);

Examples/Scripts/Python/edm4hep_to_parquet.py

@@ -32,7 +32,7 @@ def main():
         help="If None, the HepMC3 will read the entire file to determine the number of available events.",
     )
     parser.add_argument(
-        "--pileup", "--pu", type=Path, help="Pileup file", required=False
+        "--pileup", "--pu", type=Path, help="Pileup file", required=True
     )
     parser.add_argument("--output", "-o", type=Path, help="Output file", required=True)
     parser.add_argument("--force", "-f", action="store_true", help="Force overwrite")
@@ -68,7 +68,7 @@ def main():
 
     if not args.hard_scatter.exists():
         raise FileNotFoundError(f"Hard scatter file {args.hard_scatter} does not exist")
-    if args.pileup is not None and not args.pileup.exists():
+    if not args.pileup.exists():
         raise FileNotFoundError(f"Pileup file {args.pileup} does not exist")
 
     extensions = {
@@ -98,13 +98,12 @@ def main():
 
     rng = acts.examples.RandomNumbers(seed=42)
     HepMC3Reader = acts.examples.hepmc3.HepMC3Reader
-    inputs = [HepMC3Reader.Input.Fixed(args.hard_scatter, 1)]
-    if args.pileup is not None:
-        inputs.append(HepMC3Reader.Input.Fixed(args.pileup, args.pileup_multiplicity))
-
     s.addReader(
         HepMC3Reader(
-            inputs=inputs,
+            inputs=[
+                HepMC3Reader.Input.Fixed(args.hard_scatter, 1),
+                HepMC3Reader.Input.Fixed(args.pileup, args.pileup_multiplicity),
+            ],
             level=acts.logging.INFO,
             outputEvent="hepmc3_event",
             checkEventNumber=False,  # This is not generally guaranteed for arbitrary inputs

Examples/Scripts/Python/hepmc3_merge.py

@@ -153,5 +153,5 @@ def runPropagation(
         outputDir=os.getcwd() + "/propagation",
         s=None,
         decorators=contextDecorators,
-        sterileLogger=False,
+        sterileLogger=True,
     ).run()