eic · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025
diff --git a/.clang-format b/.clang-format
@@ -3,7 +3,7 @@ BasedOnStyle:  LLVM
 BreakConstructorInitializersBeforeComma: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 Cpp11BracedListStyle: true
-Standard: Cpp11
+Standard: c++20
 #SpaceBeforeParens: ControlStatements
 SpaceAfterControlStatementKeyword: true
 PointerBindsToType: true
@@ -12,4 +12,6 @@ UseTab:          Never
 ColumnLimit:     100
 NamespaceIndentation: Inner
 AlignConsecutiveAssignments: true
+SortIncludes: Never
+ReflowComments: false
 ...
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,18 @@
-ci:
-    skip: [clang-format]
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v5.0.0
   hooks:
+  - id: check-yaml
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/codespell-project/codespell
   rev: v2.3.0
   hooks:
   - id: codespell
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v19.1.4
+  hooks:
+  - id: clang-format
 - repo: https://github.com/Lucas-C/pre-commit-hooks
   rev: v1.5.5
   hooks:
@@ -18,11 +21,6 @@ repos:
   - id: forbid-tabs
   - id: remove-tabs
     args: [--whitespaces-count, '8']
-- repo: https://github.com/pocc/pre-commit-hooks
-  rev: v1.3.5
-  hooks:
-  - id: clang-format
-    args: [-i]
 - repo: https://github.com/cheshirekow/cmake-format-precommit
   rev: v0.6.13
   hooks:

diff --git a/src/algorithms/digi/PhotoMultiplierHitDigi.cc b/src/algorithms/digi/PhotoMultiplierHitDigi.cc
@@ -90,7 +90,7 @@ void PhotoMultiplierHitDigi::process(
             if (m_rngUni() > m_cfg.safetyFactor) continue;
 
             // quantum efficiency
-            if (!qe_pass(edep_eV, m_rngUni())) continue;
+            if (m_cfg.enableQuantumEfficiency and !qe_pass(edep_eV, m_rngUni())) continue;
 
             // pixel gap cuts
             if(m_cfg.enablePixelGaps) {
@@ -205,16 +205,18 @@ void PhotoMultiplierHitDigi::qe_init()
           debug("  {:>10.4} {:<}",en,qe);
         trace("{:=^60}","");
 
-        // sanity checks
-        if (qeff.empty()) {
-            qeff = {{2.6, 0.3}, {7.0, 0.3}};
-            warning("Invalid quantum efficiency data provided, using default values {} {:.2f} {} {:.2f} {} {:.2f} {} {:.2f} {}","{{", qeff.front().first, ",", qeff.front().second, "},{",qeff.back().first,",",qeff.back().second,"}}");
-        }
-        if (qeff.front().first > 3.0) {
-            warning("Quantum efficiency data start from {:.2f} {}", qeff.front().first, " eV, maybe you are using wrong units?");
-        }
-        if (qeff.back().first < 3.0) {
-            warning("Quantum efficiency data end at {:.2f} {}", qeff.back().first, " eV, maybe you are using wrong units?");
+        if (m_cfg.enableQuantumEfficiency) {
+            // sanity checks
+            if (qeff.empty()) {
+                qeff = {{2.6, 0.3}, {7.0, 0.3}};
+                warning("Invalid quantum efficiency data provided, using default values {} {:.2f} {} {:.2f} {} {:.2f} {} {:.2f} {}","{{", qeff.front().first, ",", qeff.front().second, "},{",qeff.back().first,",",qeff.back().second,"}}");
+            }
+            if (qeff.front().first > 3.0) {
+                warning("Quantum efficiency data start from {:.2f} {}", qeff.front().first, " eV, maybe you are using wrong units?");
+            }
+            if (qeff.back().first < 3.0) {
+                warning("Quantum efficiency data end at {:.2f} {}", qeff.back().first, " eV, maybe you are using wrong units?");
+            }
         }
 }
 

diff --git a/src/algorithms/digi/PhotoMultiplierHitDigiConfig.h b/src/algorithms/digi/PhotoMultiplierHitDigiConfig.h
@@ -41,6 +41,7 @@ namespace eicrecon {
       double safetyFactor = 1.0; // allowed range: (0,1]
 
       // quantum efficiency
+      bool enableQuantumEfficiency = true;
       // - wavelength units are [nm]
       // FIXME: figure out how users can override this, maybe an external `yaml` file
       std::vector<std::pair<double, double> > quantumEfficiency = {

diff --git a/src/algorithms/interfaces/ParticleSvc.cc b/src/algorithms/interfaces/ParticleSvc.cc
@@ -8,6 +8,7 @@
 namespace algorithms {
 
 const std::shared_ptr<ParticleSvc::ParticleMap> ParticleSvc::kParticleMap =
+// clang-format off
   std::make_shared<ParticleSvc::ParticleMap>(ParticleSvc::ParticleMap{
     {           0, {           0,   0,   0.0           , "unknown" }},
     {          11, {          11,  -1,   0.000510998928, "e-" }},
@@ -248,5 +249,6 @@ const std::shared_ptr<ParticleSvc::ParticleMap> ParticleSvc::kParticleMap =
     {  1000020030, {  1000020030,   2,   2.80923       , "He-3" }},
     {  1000020040, {  1000020040,   2,   3.72742       , "Alpha" }},
 });
+// clang-format on
 
 } // namespace algorithms
diff --git a/src/algorithms/tracking/IterativeVertexFinder.cc b/src/algorithms/tracking/IterativeVertexFinder.cc
@@ -73,7 +73,6 @@ std::unique_ptr<edm4eic::VertexCollection> eicrecon::IterativeVertexFinder::prod
   auto outputVertices = std::make_unique<edm4eic::VertexCollection>();
 
   using Propagator        = Acts::Propagator<Acts::EigenStepper<>>;
-  using PropagatorOptions = Acts::PropagatorOptions<>;
 #if Acts_VERSION_MAJOR >= 33
   using Linearizer        = Acts::HelicalTrackLinearizer;
   using VertexFitter      = Acts::FullBilloirVertexFitter;
@@ -102,7 +101,6 @@ std::unique_ptr<edm4eic::VertexCollection> eicrecon::IterativeVertexFinder::prod
   auto propagator = std::make_shared<Propagator>(
     stepper, Acts::detail::VoidNavigator{}, logger().cloneWithSuffix("Prop"));
 #endif
-  Acts::PropagatorOptions opts(m_geoctx, m_fieldctx);
 
   // Setup the track linearizer
 #if Acts_VERSION_MAJOR >= 33

diff --git a/src/detectors/DIRC/DIRC.cc b/src/detectors/DIRC/DIRC.cc
@@ -1,14 +1,8 @@
-// Copyright 2022,2023 Christopher Dilks, Nilanga Wickramaarachchi
-// Subject to the terms in the LICENSE file found in the top-level directory.
-//
-//
-
 // SPDX-License-Identifier: LGPL-3.0-or-later
-// Copyright (C) 2024, Dmitry Kalinkin
+// Copyright (C) 2022 - 2025 Christopher Dilks, Nilanga Wickramaarachchi, Dmitry Kalinkin
 
 #include <DD4hep/Detector.h>
 #include <JANA/JApplication.h>
-#include <stddef.h>
 #include <algorithm>
 #include <gsl/pointers>
 #include <memory>
@@ -46,34 +40,10 @@ extern "C" {
     digi_cfg.pedError        = 3.0;
     digi_cfg.enablePixelGaps = false;
     digi_cfg.safetyFactor    = 1.0;
+    // Actual efficiency is implemented in npsim via a stacking action
+    digi_cfg.enableQuantumEfficiency = false;
     digi_cfg.quantumEfficiency.clear();
 
-    std::vector<double> sensor_qe{
-      0,    0,    14.0, 14.8, 14.5, 14.9, 14.4, 14.2, 13.9, 14.6, 15.2, 15.7, 16.4, 16.9, 17.5,
-      17.7, 18.1, 18.8, 19.3, 19.8, 20.6, 21.4, 22.4, 23.1, 23.6, 24.1, 24.2, 24.6, 24.8, 25.2,
-      25.7, 26.5, 27.1, 28.2, 29.0, 29.9, 30.8, 31.1, 31.7, 31.8, 31.6, 31.5, 31.5, 31.3, 31.0,
-      30.8, 30.8, 30.4, 30.2, 30.3, 30.2, 30.1, 30.1, 30.1, 29.8, 29.9, 29.8, 29.7, 29.7, 29.7,
-      29.8, 29.8, 29.9, 29.9, 29.8, 29.9, 29.8, 29.9, 29.8, 29.7, 29.8, 29.7, 29.8, 29.6, 29.5,
-      29.7, 29.7, 29.8, 30.1, 30.4, 31.0, 31.3, 31.5, 31.8, 31.8, 31.9, 32.0, 32.0, 32.0, 32.0,
-      32.2, 32.2, 32.1, 31.8, 31.8, 31.8, 31.7, 31.6, 31.6, 31.7, 31.5, 31.5, 31.4, 31.3, 31.3,
-      31.2, 30.8, 30.7, 30.5, 30.3, 29.9, 29.5, 29.3, 29.2, 28.6, 28.2, 27.9, 27.8, 27.3, 27.0,
-      26.6, 26.1, 25.9, 25.5, 25.0, 24.6, 24.2, 23.8, 23.4, 23.0, 22.7, 22.4, 21.9, 21.4, 21.2,
-      20.7, 20.3, 19.8, 19.6, 19.3, 18.9, 18.7, 18.3, 17.9, 17.8, 17.8, 16.7, 16.5, 16.4, 16.0,
-      15.6, 15.6, 15.2, 14.9, 14.6, 14.4, 14.1, 13.8, 13.6, 13.3, 13.0, 12.8, 12.6, 12.3, 12.0,
-      11.9, 11.7, 11.5, 11.2, 11.1, 10.9, 10.7, 10.4, 10.3, 9.9,  9.8,  9.6,  9.3,  9.1,  9.0,
-      8.8,  8.5,  8.3,  8.3,  8.2,  7.9,  7.8,  7.7,  7.5,  7.3,  7.1,  6.9,  6.7,  6.6,  6.3,
-      6.2,  6.0,  5.8,  5.7,  5.6,  5.4,  5.2,  5.1,  4.9,  4.8,  4.6,  4.5,  4.4,  4.2,  4.1,
-      4.0,  3.8,  3.7,  3.5,  3.3,  3.2,  3.1,  3.0,  2.9,  2.5,  2.4,  2.4,  2.3,  2.3,  2.1,
-      1.8,  1.6,  1.5,  1.5,  1.6,  1.8,  1.9,  1.4,  0.8,  0.9,  0.8,  0.7,  0.6,  0.3,  0.3,
-      0.5,  0.3,  0.4,  0.3,  0.1,  0.2,  0.1,  0.2,  0.3,  0.0};
-
-    for(size_t i=0; i < sensor_qe.size(); i++)
-      {
-        double wavelength = 180 + i * 2; // wavelength units are [nm]
-        digi_cfg.quantumEfficiency.push_back({wavelength, sensor_qe[i]*0.01});
-      }
-
-
     // digitization
     app->Add(new JOmniFactoryGeneratorT<PhotoMultiplierHitDigi_factory>(
           "DIRCRawHits",

diff --git a/src/services/io/podio/make_datamodel_glue.py b/src/services/io/podio/make_datamodel_glue.py
@@ -67,6 +67,11 @@
 
 def AddCollections(datamodelName, collectionfiles):
     for f in collectionfiles:
+        # require at least a class definition, not a using alias
+        with open(f, 'r') as file:
+            if not "class" in file.read():
+                continue
+
         header_fname = f.split('/'+datamodelName)[-1]
         basename = header_fname.split('/')[-1].split('Collection.h')[0]
 

diff --git a/src/utilities/eicrecon/eicrecon.cc b/src/utilities/eicrecon/eicrecon.cc
@@ -12,43 +12,44 @@
 /// The default plugins
 /// Add new default plugin names here and the main() will do JApplication::AddPlugin() for you.
 std::vector<std::string> EICRECON_DEFAULT_PLUGINS = {
-
-        "log",
-        "dd4hep",
-        "acts",
-        "algorithms_init",
-        "evaluator",
-        "pid_lut",
-        "richgeo",
-        "rootfile",
-        "beam",
-        "reco",
-        "tracking",
-        "pid",
-        "EEMC",
-        "BEMC",
-        "FEMC",
-        "EHCAL",
-        "BHCAL",
-        "FHCAL",
-        "B0ECAL",
-        "ZDC",
-        "BTRK",
-        "BVTX",
-        "PFRICH",
-        "DIRC",
-        "DRICH",
-        "ECTRK",
-        "MPGD",
-        "B0TRK",
-        "RPOTS",
-        "FOFFMTRK",
-        "BTOF",
-        "ECTOF",
-        "LOWQ2",
-        "LUMISPECCAL",
-        "podio",
-        "janatop",
+// clang-format off
+    "log",
+    "dd4hep",
+    "acts",
+    "algorithms_init",
+    "evaluator",
+    "pid_lut",
+    "richgeo",
+    "rootfile",
+    "beam",
+    "reco",
+    "tracking",
+    "pid",
+    "EEMC",
+    "BEMC",
+    "FEMC",
+    "EHCAL",
+    "BHCAL",
+    "FHCAL",
+    "B0ECAL",
+    "ZDC",
+    "BTRK",
+    "BVTX",
+    "PFRICH",
+    "DIRC",
+    "DRICH",
+    "ECTRK",
+    "MPGD",
+    "B0TRK",
+    "RPOTS",
+    "FOFFMTRK",
+    "BTOF",
+    "ECTOF",
+    "LOWQ2",
+    "LUMISPECCAL",
+    "podio",
+    "janatop",
+// clang-format on
 };
 
 int main( int narg, char **argv)