From b4d5ec0ae4f588660e4df575c4c2c78eb88ff36d Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 19 Sep 2022 19:02:05 -0500
Subject: [PATCH] fix: switch back to single hit collections
---
options/reconstruction.py | 22 ++++++----------------
options/reconstruction.raw.py | 22 ++++++----------------
2 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/options/reconstruction.py b/options/reconstruction.py
index 1b803fbb..f859d2b6 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -223,36 +223,26 @@ if has_ecal_barrel_scfi:
sim_coll += ecal_barrel_scfi_collections
forward_romanpot_collections = [
- "ForwardRomanPotHits1",
- "ForwardRomanPotHits2",
+ "ForwardRomanPotHits",
]
forward_offmtracker_collections = [
- "ForwardOffMTrackerHits1",
- "ForwardOffMTrackerHits2",
- "ForwardOffMTrackerHits3",
- "ForwardOffMTrackerHits4",
+ "ForwardOffMTrackerHits",
]
sim_coll += forward_romanpot_collections + forward_offmtracker_collections
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",
]
+
sim_coll += (
tracker_endcap_collections
+ tracker_barrel_collections
diff --git a/options/reconstruction.raw.py b/options/reconstruction.raw.py
index 6a3b2c84..bd1759d5 100644
--- a/options/reconstruction.raw.py
+++ b/options/reconstruction.raw.py
@@ -99,36 +99,26 @@ if has_ecal_barrel_scfi:
sim_coll += ecal_barrel_scfi_collections
forward_romanpot_collections = [
- "ForwardRomanPotHits1",
- "ForwardRomanPotHits2",
+ "ForwardRomanPotHits",
]
forward_offmtracker_collections = [
- "ForwardOffMTrackerHits1",
- "ForwardOffMTrackerHits2",
- "ForwardOffMTrackerHits3",
- "ForwardOffMTrackerHits4",
+ "ForwardOffMTrackerHits",
]
sim_coll += forward_romanpot_collections + forward_offmtracker_collections
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",
]
+
sim_coll += (
tracker_endcap_collections
+ tracker_barrel_collections
--
GitLab