BTOF,DRICH,DIRC,PFRICH: unroll PID LUT factory initialization loops (#…

…1536) This is to help developers to find the code using simple search.
eic · Jul 29, 2024 · ec93c74 · ec93c74
1 parent be33725
commit ec93c74
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 113 deletions.
diff --git a/src/detectors/BTOF/BTOF.cc b/src/detectors/BTOF/BTOF.cc
@@ -8,15 +8,13 @@
 #include <DD4hep/Detector.h>
 #include <Evaluator/DD4hepUnits.h>
 #include <JANA/JApplication.h>
-#include <fmt/core.h>
 #include <algorithm>
 #include <gsl/pointers>
 #include <memory>
 #include <stdexcept>
-#include <string>
-#include <vector>
 
 #include "algorithms/interfaces/WithPodConfig.h"
+#include "algorithms/pid_lut/PIDLookupConfig.h"
 #include "extensions/jana/JOmniFactoryGeneratorT.h"
 #include "factories/digi/SiliconTrackerDigi_factory.h"
 #include "factories/tracking/TrackerHitReconstruction_factory.h"
@@ -64,32 +62,46 @@ void InitPlugin(JApplication *app) {
     } catch(const std::runtime_error&) {
         // Nothing
     }
-    for (auto qualifier : std::vector<std::string>({"", "Seeded"})) {
-        app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
-              fmt::format("CombinedTOF{}LUTPID", qualifier),
-              {
-              fmt::format("Reconstructed{}ChargedWithPFRICHPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithPFRICHPIDParticleAssociations", qualifier),
-              },
-              {
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFPIDParticleAssociations", qualifier),
-              fmt::format("CombinedTOF{}ParticleIDs", qualifier),
-              },
-              {
-                .filename="calibrations/tof.lut",
-                .system=BarrelTOF_ID,
-                .pdg_values={11, 211, 321, 2212},
-                .charge_values={1},
-                .momentum_edges={0.0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3.0, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6.0},
-                .polar_edges={2.50, 10.95, 19.40, 27.85, 36.30, 44.75, 53.20, 61.65, 70.10, 78.55, 87.00, 95.45, 103.90, 112.35, 120.80, 129.25, 137.70, 146.15, 154.60},
-                .azimuthal_binning={0., 360., 360.}, // lower, upper, step
-                .momentum_bin_centers_in_lut=true,
-                .polar_bin_centers_in_lut=true,
-              },
-              app
-              ));
-    }
+    PIDLookupConfig pid_cfg {
+      .filename="calibrations/tof.lut",
+      .system=BarrelTOF_ID,
+      .pdg_values={11, 211, 321, 2212},
+      .charge_values={1},
+      .momentum_edges={0.0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3.0, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6.0},
+      .polar_edges={2.50, 10.95, 19.40, 27.85, 36.30, 44.75, 53.20, 61.65, 70.10, 78.55, 87.00, 95.45, 103.90, 112.35, 120.80, 129.25, 137.70, 146.15, 154.60},
+      .azimuthal_binning={0., 360., 360.}, // lower, upper, step
+      .momentum_bin_centers_in_lut=true,
+      .polar_bin_centers_in_lut=true,
+    };
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "CombinedTOFLUTPID",
+          {
+          "ReconstructedChargedWithPFRICHPIDParticles",
+          "ReconstructedChargedWithPFRICHPIDParticleAssociations",
+          },
+          {
+          "ReconstructedChargedWithPFRICHTOFPIDParticles",
+          "ReconstructedChargedWithPFRICHTOFPIDParticleAssociations",
+          "CombinedTOFParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
 
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "CombinedTOFSeededLUTPID",
+          {
+          "ReconstructedSeededChargedWithPFRICHPIDParticles",
+          "ReconstructedSeededChargedWithPFRICHPIDParticleAssociations",
+          },
+          {
+          "ReconstructedSeededChargedWithPFRICHTOFPIDParticles",
+          "ReconstructedSeededChargedWithPFRICHTOFPIDParticleAssociations",
+          "CombinedTOFSeededParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
 }
 } // extern "C"
diff --git a/src/detectors/DIRC/DIRC.cc b/src/detectors/DIRC/DIRC.cc
@@ -8,18 +8,17 @@
 
 #include <DD4hep/Detector.h>
 #include <JANA/JApplication.h>
-#include <fmt/core.h>
 #include <stddef.h>
 #include <algorithm>
 #include <gsl/pointers>
 #include <memory>
 #include <stdexcept>
-#include <string>
 #include <utility>
 #include <vector>
 
 // algorithm configurations
 #include "algorithms/digi/PhotoMultiplierHitDigiConfig.h"
+#include "algorithms/pid_lut/PIDLookupConfig.h"
 #include "extensions/jana/JOmniFactoryGeneratorT.h"
 // factories
 #include "global/digi/PhotoMultiplierHitDigi_factory.h"
@@ -91,29 +90,44 @@ extern "C" {
     } catch(const std::runtime_error&) {
         // Nothing
     }
-    for (auto qualifier : std::vector<std::string>({"", "Seeded"})) {
-        app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
-              fmt::format("DIRC{}LUTPID", qualifier),
-              {
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFPIDParticleAssociations", qualifier),
-              },
-              {
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFDIRCPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFDIRCPIDParticleAssociations", qualifier),
-              fmt::format("DIRC{}ParticleIDs", qualifier),
-              },
-              {
-                .filename="calibrations/hpdirc.lut.gz",
-                .system=BarrelDIRC_ID,
-                .pdg_values={11, 211, 321, 2212},
-                .charge_values={-1, 1},
-                .momentum_edges={0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4, 2.6, 2.8, 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6, 5.8, 6.0, 6.2, 6.4, 6.6, 6.8, 7.0, 7.2, 7.4, 7.6, 7.8, 8.0, 8.2, 8.4, 8.6, 8.8, 9.0, 9.2, 9.4, 9.6, 9.8, 10.0, 10.2},
-                .polar_edges={25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0, 50.0, 51.0, 52.0, 53.0, 54.0, 55.0, 56.0, 57.0, 58.0, 59.0, 60.0, 61.0, 62.0, 63.0, 64.0, 65.0, 66.0, 67.0, 68.0, 69.0, 70.0, 71.0, 72.0, 73.0, 74.0, 75.0, 76.0, 77.0, 78.0, 79.0, 80.0, 81.0, 82.0, 83.0, 84.0, 85.0, 86.0, 87.0, 88.0, 89.0, 90.0, 91.0, 92.0, 93.0, 94.0, 95.0, 96.0, 97.0, 98.0, 99.0, 100.0, 101.0, 102.0, 103.0, 104.0, 105.0, 106.0, 107.0, 108.0, 109.0, 110.0, 111.0, 112.0, 113.0, 114.0, 115.0, 116.0, 117.0, 118.0, 119.0, 120.0, 121.0, 122.0, 123.0, 124.0, 125.0, 126.0, 127.0, 128.0, 129.0, 130.0, 131.0, 132.0, 133.0, 134.0, 135.0, 136.0, 137.0, 138.0, 139.0, 140.0, 141.0, 142.0, 143.0, 144.0, 145.0, 146.0, 147.0, 148.0, 149.0, 150.0, 151.0, 152.0, 153.0, 154.0, 155.0, 156.0, 157.0, 158.0, 159.0, 160.0},
-                .azimuthal_binning={0.0, 30.5, 0.5}, // lower, upper, step
-              },
-              app
-              ));
-    }
+    PIDLookupConfig pid_cfg {
+      .filename="calibrations/hpdirc.lut.gz",
+      .system=BarrelDIRC_ID,
+      .pdg_values={11, 211, 321, 2212},
+      .charge_values={-1, 1},
+      .momentum_edges={0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4, 2.6, 2.8, 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6, 5.8, 6.0, 6.2, 6.4, 6.6, 6.8, 7.0, 7.2, 7.4, 7.6, 7.8, 8.0, 8.2, 8.4, 8.6, 8.8, 9.0, 9.2, 9.4, 9.6, 9.8, 10.0, 10.2},
+      .polar_edges={25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0, 50.0, 51.0, 52.0, 53.0, 54.0, 55.0, 56.0, 57.0, 58.0, 59.0, 60.0, 61.0, 62.0, 63.0, 64.0, 65.0, 66.0, 67.0, 68.0, 69.0, 70.0, 71.0, 72.0, 73.0, 74.0, 75.0, 76.0, 77.0, 78.0, 79.0, 80.0, 81.0, 82.0, 83.0, 84.0, 85.0, 86.0, 87.0, 88.0, 89.0, 90.0, 91.0, 92.0, 93.0, 94.0, 95.0, 96.0, 97.0, 98.0, 99.0, 100.0, 101.0, 102.0, 103.0, 104.0, 105.0, 106.0, 107.0, 108.0, 109.0, 110.0, 111.0, 112.0, 113.0, 114.0, 115.0, 116.0, 117.0, 118.0, 119.0, 120.0, 121.0, 122.0, 123.0, 124.0, 125.0, 126.0, 127.0, 128.0, 129.0, 130.0, 131.0, 132.0, 133.0, 134.0, 135.0, 136.0, 137.0, 138.0, 139.0, 140.0, 141.0, 142.0, 143.0, 144.0, 145.0, 146.0, 147.0, 148.0, 149.0, 150.0, 151.0, 152.0, 153.0, 154.0, 155.0, 156.0, 157.0, 158.0, 159.0, 160.0},
+      .azimuthal_binning={0.0, 30.5, 0.5}, // lower, upper, step
+    };
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "DIRCLUTPID",
+          {
+          "ReconstructedChargedWithPFRICHTOFPIDParticles",
+          "ReconstructedChargedWithPFRICHTOFPIDParticleAssociations",
+          },
+          {
+          "ReconstructedChargedWithPFRICHTOFDIRCPIDParticles",
+          "ReconstructedChargedWithPFRICHTOFDIRCPIDParticleAssociations",
+          "DIRCParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "DIRCSeededLUTPID",
+          {
+          "ReconstructedSeededChargedWithPFRICHTOFPIDParticles",
+          "ReconstructedSeededChargedWithPFRICHTOFPIDParticleAssociations",
+          },
+          {
+          "ReconstructedSeededChargedWithPFRICHTOFDIRCPIDParticles",
+          "ReconstructedSeededChargedWithPFRICHTOFDIRCPIDParticleAssociations",
+          "DIRCSeededParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
   }
 }
diff --git a/src/detectors/DRICH/DRICH.cc b/src/detectors/DRICH/DRICH.cc
@@ -8,7 +8,6 @@
 #include <DD4hep/Detector.h>
 #include <Evaluator/DD4hepUnits.h>
 #include <JANA/JApplication.h>
-#include <fmt/core.h>
 #include <math.h>
 #include <functional>
 #include <gsl/pointers>
@@ -23,6 +22,7 @@
 #include "algorithms/digi/PhotoMultiplierHitDigiConfig.h"
 #include "algorithms/pid/IrtCherenkovParticleIDConfig.h"
 #include "algorithms/pid/MergeParticleIDConfig.h"
+#include "algorithms/pid_lut/PIDLookupConfig.h"
 #include "algorithms/tracking/TrackPropagationConfig.h"
 #include "extensions/jana/JOmniFactoryGeneratorT.h"
 // factories
@@ -195,33 +195,48 @@ extern "C" {
     } catch(const std::runtime_error&) {
         // Nothing
     }
-    for (auto qualifier : std::vector<std::string>({"", "Seeded"})) {
-        app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
-              fmt::format("DRICH{}LUTPID", qualifier),
-              {
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFDIRCPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithPFRICHTOFDIRCPIDParticleAssociations", qualifier),
-              },
-              {
-              fmt::format("Reconstructed{}ChargedParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedParticleAssociations", qualifier),
-              fmt::format("DRICH{}ParticleIDs", qualifier),
-              },
-              {
-                .filename="calibrations/drich.lut",
-                .system=ForwardRICH_ID,
-                .pdg_values={211, 321, 2212},
-                .charge_values={1},
-                .momentum_edges={0.25, 0.75, 1.25, 1.75, 2.25, 2.75, 3.25, 3.75, 4.25, 4.75, 5.25, 5.75, 6.25, 6.75, 7.25, 7.75, 8.25, 8.75, 9.25, 9.75, 10.25, 10.75, 11.25, 11.75, 12.25, 12.75, 13.25, 13.75, 14.25, 14.75, 15.25, 15.75, 16.25, 16.75, 17.25, 17.75, 18.25, 18.75, 19.25, 19.75, 20.50, 21.50, 22.50, 23.50, 24.50, 25.50, 26.50, 27.50, 28.50, 29.50, 30.50},
-                .polar_edges={0.060, 0.164, 0.269, 0.439},
-                .azimuthal_binning={0., 2 * M_PI, 2 * M_PI}, // lower, upper, step
-                .polar_bin_centers_in_lut=true,
-                .use_radians=true,
-                .missing_electron_prob=true,
-              },
-              app
-              ));
-    }
+    PIDLookupConfig pid_cfg {
+      .filename="calibrations/drich.lut",
+      .system=ForwardRICH_ID,
+      .pdg_values={211, 321, 2212},
+      .charge_values={1},
+      .momentum_edges={0.25, 0.75, 1.25, 1.75, 2.25, 2.75, 3.25, 3.75, 4.25, 4.75, 5.25, 5.75, 6.25, 6.75, 7.25, 7.75, 8.25, 8.75, 9.25, 9.75, 10.25, 10.75, 11.25, 11.75, 12.25, 12.75, 13.25, 13.75, 14.25, 14.75, 15.25, 15.75, 16.25, 16.75, 17.25, 17.75, 18.25, 18.75, 19.25, 19.75, 20.50, 21.50, 22.50, 23.50, 24.50, 25.50, 26.50, 27.50, 28.50, 29.50, 30.50},
+      .polar_edges={0.060, 0.164, 0.269, 0.439},
+      .azimuthal_binning={0., 2 * M_PI, 2 * M_PI}, // lower, upper, step
+      .polar_bin_centers_in_lut=true,
+      .use_radians=true,
+      .missing_electron_prob=true,
+    };
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "DRICHLUTPID",
+          {
+          "ReconstructedChargedWithPFRICHTOFDIRCPIDParticles",
+          "ReconstructedChargedWithPFRICHTOFDIRCPIDParticleAssociations",
+          },
+          {
+          "ReconstructedChargedParticles",
+          "ReconstructedChargedParticleAssociations",
+          "DRICHParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "DRICHSeededLUTPID",
+          {
+          "ReconstructedSeededChargedWithPFRICHTOFDIRCPIDParticles",
+          "ReconstructedSeededChargedWithPFRICHTOFDIRCPIDParticleAssociations",
+          },
+          {
+          "ReconstructedSeededChargedParticles",
+          "ReconstructedSeededChargedParticleAssociations",
+          "DRICHSeededParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
     // clang-format on
   }
 }
diff --git a/src/detectors/PFRICH/PFRICH.cc b/src/detectors/PFRICH/PFRICH.cc
@@ -7,18 +7,17 @@
 #include <DD4hep/Detector.h>
 #include <Evaluator/DD4hepUnits.h>
 #include <JANA/JApplication.h>
-#include <fmt/core.h>
 #include <math.h>
 #include <algorithm>
 #include <gsl/pointers>
 #include <memory>
 #include <stdexcept>
-#include <string>
 #include <utility>
 #include <vector>
 
 // algorithm configurations
 #include "algorithms/digi/PhotoMultiplierHitDigiConfig.h"
+#include "algorithms/pid_lut/PIDLookupConfig.h"
 #include "extensions/jana/JOmniFactoryGeneratorT.h"
 // factories
 #include "global/digi/PhotoMultiplierHitDigi_factory.h"
@@ -85,33 +84,48 @@ extern "C" {
     } catch(const std::runtime_error&) {
         // Nothing
     }
-    for (auto qualifier : std::vector<std::string>({"", "Seeded"})) {
-        app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
-              fmt::format("RICHEndcapN{}LUTPID", qualifier),
-              {
-              fmt::format("Reconstructed{}ChargedWithoutPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithoutPIDParticleAssociations", qualifier),
-              },
-              {
-              fmt::format("Reconstructed{}ChargedWithPFRICHPIDParticles", qualifier),
-              fmt::format("Reconstructed{}ChargedWithPFRICHPIDParticleAssociations", qualifier),
-              fmt::format("RICHEndcapN{}ParticleIDs", qualifier),
-              },
-              {
-                .filename="calibrations/pfrich.lut",
-                .system=BackwardRICH_ID,
-                .pdg_values={11, 211, 321, 2212},
-                .charge_values={1},
-                .momentum_edges={0.4, 0.8, 1.2, 1.6, 2, 2.4, 2.8, 3.2, 3.6, 4, 4.4, 4.8, 5.2, 5.6, 6, 6.4, 6.8, 7.2, 7.6, 8, 8.4, 8.8, 9.2, 9.6, 10, 10.4, 10.8, 11.2, 11.6, 12, 12.4, 12.8, 13.2, 13.6, 14, 14.4, 14.8, 15.2},
-                .polar_edges={2.65, 2.6725, 2.695, 2.7175, 2.74, 2.7625, 2.785, 2.8075, 2.83, 2.8525, 2.875, 2.8975, 2.92, 2.9425, 2.965, 2.9875, 3.01, 3.0325, 3.055, 3.0775},
-                .azimuthal_binning={0., 2 * M_PI, 2 * M_PI / 120.}, // lower, upper, step
-                .azimuthal_bin_centers_in_lut=true,
-                .momentum_bin_centers_in_lut=true,
-                .polar_bin_centers_in_lut=true,
-                .use_radians=true,
-              },
-              app
-              ));
-    }
+    PIDLookupConfig pid_cfg {
+      .filename="calibrations/pfrich.lut",
+      .system=BackwardRICH_ID,
+      .pdg_values={11, 211, 321, 2212},
+      .charge_values={1},
+      .momentum_edges={0.4, 0.8, 1.2, 1.6, 2, 2.4, 2.8, 3.2, 3.6, 4, 4.4, 4.8, 5.2, 5.6, 6, 6.4, 6.8, 7.2, 7.6, 8, 8.4, 8.8, 9.2, 9.6, 10, 10.4, 10.8, 11.2, 11.6, 12, 12.4, 12.8, 13.2, 13.6, 14, 14.4, 14.8, 15.2},
+      .polar_edges={2.65, 2.6725, 2.695, 2.7175, 2.74, 2.7625, 2.785, 2.8075, 2.83, 2.8525, 2.875, 2.8975, 2.92, 2.9425, 2.965, 2.9875, 3.01, 3.0325, 3.055, 3.0775},
+      .azimuthal_binning={0., 2 * M_PI, 2 * M_PI / 120.}, // lower, upper, step
+      .azimuthal_bin_centers_in_lut=true,
+      .momentum_bin_centers_in_lut=true,
+      .polar_bin_centers_in_lut=true,
+      .use_radians=true,
+    };
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "RICHEndcapNLUTPID",
+          {
+          "ReconstructedChargedWithoutPIDParticles",
+          "ReconstructedChargedWithoutPIDParticleAssociations",
+          },
+          {
+          "ReconstructedChargedWithPFRICHPIDParticles",
+          "ReconstructedChargedWithPFRICHPIDParticleAssociations",
+          "RICHEndcapNParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
+
+    app->Add(new JOmniFactoryGeneratorT<PIDLookup_factory>(
+          "RICHEndcapNSeededLUTPID",
+          {
+          "ReconstructedSeededChargedWithoutPIDParticles",
+          "ReconstructedSeededChargedWithoutPIDParticleAssociations",
+          },
+          {
+          "ReconstructedSeededChargedWithPFRICHPIDParticles",
+          "ReconstructedSeededChargedWithPFRICHPIDParticleAssociations",
+          "RICHEndcapNSeededParticleIDs",
+          },
+          pid_cfg,
+          app
+          ));
   }
 }