fix: switch back to single hit collections

benchmarks/far_forward/analysis/hits_far_forward_protons.cxx

@@ -104,11 +104,11 @@ int hits_far_forward_protons(const char* fname = "sim_far_forward_protons.edm4he
                  //.Define("delta_p_over_p1",delta_p_over_p, {"p_track1", "p_thrown"})
                  //.Define("delta_p_over_p2",delta_p_over_p, {"p_track2", "p_thrown"})
                  //.Define("N_VtxBarrelHits",[](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
-                 .Define("N_BarrelHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"OuterSiBarrelHits"})
-                 .Define("N_EndcapHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"OuterTrackerEndcapPHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"SiBarrelHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerEndcapPHits"})
                  ;
 
-  auto hBarrel_x_vs_y = df0.Histo2D({"hBarrel_x_vs_y", "; x ; y ",   100, -900, 900,100, -900, 900 }, "OuterSiBarrelHits.position.x", "OuterSiBarrelHits.position.y");
+  auto hBarrel_x_vs_y = df0.Histo2D({"hBarrel_x_vs_y", "; x ; y ",   100, -900, 900,100, -900, 900 }, "SiBarrelHits.position.x", "SiBarrelHits.position.y");
 
   auto hBarrel_N_vs_theta = df0.Histo1D({"hBarrel_N_vs_theta", "; #theta [deg.]",   20, 0, 180 }, "theta0", "N_BarrelHits");
   auto hEndcap_N_vs_theta = df0.Histo1D({"hEndcap_N_vs_theta", "; #theta [deg.]",   20, 0, 180 }, "theta0", "N_EndcapHits");

benchmarks/far_forward/options/far_forward_reconstruction.py

@@ -37,15 +37,11 @@ sim_colls = [
 ]
 
 ffi_romanpot_collections = [
-    "ForwardRomanPotHits1",
-    "ForwardRomanPotHits2"
+    "ForwardRomanPotHits",
 ]
 
 ffi_offmtracker_collections = [
-    "ForwardOffMTrackerHits1",
-    "ForwardOffMTrackerHits2",
-    "ForwardOffMTrackerHits3",
-    "ForwardOffMTrackerHits4"
+    "ForwardOffMTrackerHits",
 ]
 
 sim_colls += ffi_romanpot_collections + ffi_offmtracker_collections

benchmarks/track_finding/options/track_reconstruction.py

@@ -53,23 +53,16 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
 algorithms = []
 
 tracker_endcap_collections = [
-    "InnerTrackerEndcapPHits",
-    "InnerTrackerEndcapNHits",
-    "MiddleTrackerEndcapPHits",
-    "MiddleTrackerEndcapNHits",
-    "OuterTrackerEndcapPHits",
-    "OuterTrackerEndcapNHits",
+    "TrackerEndcapHits",
 ]
 tracker_barrel_collections = [
-    "SagittaSiBarrelHits",
-    "OuterSiBarrelHits",
+    "SiBarrelHits",
 ]
 vertex_barrel_collections = [
     "VertexBarrelHits",
 ]
 mpgd_barrel_collections = [
-    "InnerMPGDBarrelHits",
-    "OuterMPGDBarrelHits",
+    "MPGDBarrelHits",
 ]
 
 input_collections = (

benchmarks/track_fitting/options/track_reconstruction.py

@@ -50,23 +50,16 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
 algorithms = []
 
 tracker_endcap_collections = [
-    "InnerTrackerEndcapPHits",
-    "InnerTrackerEndcapNHits",
-    "MiddleTrackerEndcapPHits",
-    "MiddleTrackerEndcapNHits",
-    "OuterTrackerEndcapPHits",
-    "OuterTrackerEndcapNHits",
+    "TrackerEndcapHits",
 ]
 tracker_barrel_collections = [
-    "SagittaSiBarrelHits",
-    "OuterSiBarrelHits",
+    "SiBarrelHits",
 ]
 vertex_barrel_collections = [
     "VertexBarrelHits",
 ]
 mpgd_barrel_collections = [
-    "InnerMPGDBarrelHits",
-    "OuterMPGDBarrelHits",
+    "MPGDBarrelHits",
 ]
 
 input_collections = (

benchmarks/tracking/options/track_reconstruction.py

@@ -51,23 +51,16 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
 algorithms = []
 
 tracker_endcap_collections = [
-    "InnerTrackerEndcapPHits",
-    "InnerTrackerEndcapNHits",
-    "MiddleTrackerEndcapPHits",
-    "MiddleTrackerEndcapNHits",
-    "OuterTrackerEndcapPHits",
-    "OuterTrackerEndcapNHits",
+    "TrackerEndcapHits",
 ]
 tracker_barrel_collections = [
-    "SagittaSiBarrelHits",
-    "OuterSiBarrelHits",
+    "SiBarrelHits",
 ]
 vertex_barrel_collections = [
     "VertexBarrelHits",
 ]
 mpgd_barrel_collections = [
-    "InnerMPGDBarrelHits",
-    "OuterMPGDBarrelHits",
+    "MPGDBarrelHits",
 ]
 
 input_collections = (