From 2e7df167e3d5ecda637a4836c06a8e83fb2585e6 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 19 Sep 2022 19:02:28 -0500
Subject: [PATCH] fix: switch back to single hit collections
---
.../analysis/hits_far_forward_protons.cxx | 6 +++---
.../options/far_forward_reconstruction.py | 8 ++------
.../track_finding/options/track_reconstruction.py | 13 +++----------
.../track_fitting/options/track_reconstruction.py | 13 +++----------
benchmarks/tracking/options/track_reconstruction.py | 13 +++----------
5 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx b/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
index 36eae5c2..2db17315 100644
--- a/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
+++ b/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");
diff --git a/benchmarks/far_forward/options/far_forward_reconstruction.py b/benchmarks/far_forward/options/far_forward_reconstruction.py
index 368ce82d..da04f45d 100644
--- a/benchmarks/far_forward/options/far_forward_reconstruction.py
+++ b/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
diff --git a/benchmarks/track_finding/options/track_reconstruction.py b/benchmarks/track_finding/options/track_reconstruction.py
index 6be711ed..101dc11f 100644
--- a/benchmarks/track_finding/options/track_reconstruction.py
+++ b/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 = (
diff --git a/benchmarks/track_fitting/options/track_reconstruction.py b/benchmarks/track_fitting/options/track_reconstruction.py
index fb357fc9..d2169146 100644
--- a/benchmarks/track_fitting/options/track_reconstruction.py
+++ b/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 = (
diff --git a/benchmarks/tracking/options/track_reconstruction.py b/benchmarks/tracking/options/track_reconstruction.py
index e09e3f57..a0026248 100644
--- a/benchmarks/tracking/options/track_reconstruction.py
+++ b/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 = (
--
GitLab