From dd54b5d5c3d527a77b1dfed30bf3401f8aaddce9 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 25 Apr 2022 01:14:59 +0000
Subject: [PATCH] Resolve "Explicitly load CaloHitContribution whenever
SimCalorimeterHit is used"
---
options/reconstruction.ecal.py | 10 ++++++++--
options/reconstruction.hcal.py | 8 ++++++--
options/reconstruction.py | 9 +++++++++
options/reconstruction.raw.py | 7 +++++++
4 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/options/reconstruction.ecal.py b/options/reconstruction.ecal.py
index 832f12fd..caa29e0a 100644
--- a/options/reconstruction.ecal.py
+++ b/options/reconstruction.ecal.py
@@ -66,8 +66,14 @@ from Configurables import Jug__Fast__TruthClustering as TruthClustering
# branches needed from simulation root file
sim_coll = [
"MCParticles",
- "EcalEndcapNHits",
- "EcalEndcapPHits",
+ 'EcalEndcapNHits',
+ 'EcalEndcapNHitsContributions',
+ 'EcalEndcapPHits',
+ 'EcalEndcapPHitsContributions',
+ 'EcalBarrelHits',
+ 'EcalBarrelHitsContributions',
+ 'EcalBarrelScFiHits',
+ 'EcalBarrelScFiHitsContributions',
]
# list of algorithms
diff --git a/options/reconstruction.hcal.py b/options/reconstruction.hcal.py
index c8742250..b72fec2b 100644
--- a/options/reconstruction.hcal.py
+++ b/options/reconstruction.hcal.py
@@ -66,8 +66,12 @@ from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG
# branches needed from simulation root file
sim_coll = [
"MCParticles",
- "HcalEndcapPHits",
- "HcalEndcapNHits",
+ 'HcalBarrelHits',
+ 'HcalBarrelHitsContributions',
+ 'HcalEndcapPHits',
+ 'HcalEndcapPHitsContributions',
+ 'HcalEndcapNHits',
+ 'HcalEndcapNHitsContributions',
]
# list of algorithms
diff --git a/options/reconstruction.py b/options/reconstruction.py
index 270a3719..addc8f58 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -168,15 +168,24 @@ sim_coll = [
'MCParticles',
'B0TrackerHits',
'EcalEndcapNHits',
+ 'EcalEndcapNHitsContributions',
'EcalEndcapPHits',
+ 'EcalEndcapPHitsContributions',
'EcalBarrelHits',
+ 'EcalBarrelHitsContributions',
'EcalBarrelScFiHits',
+ 'EcalBarrelScFiHitsContributions',
'HcalBarrelHits',
+ 'HcalBarrelHitsContributions',
'HcalEndcapPHits',
+ 'HcalEndcapPHitsContributions',
'HcalEndcapNHits',
+ 'HcalEndcapNHitsContributions',
'DRICHHits',
'ZDCEcalHits',
+ 'ZDCEcalHitsContributions',
'ZDCHcalHits',
+ 'ZDCHcalHitsContributions',
]
forward_romanpot_collections = [
diff --git a/options/reconstruction.raw.py b/options/reconstruction.raw.py
index 92e32574..d51f1456 100644
--- a/options/reconstruction.raw.py
+++ b/options/reconstruction.raw.py
@@ -67,12 +67,19 @@ sim_coll = [
'MCParticles',
'B0TrackerHits',
'EcalEndcapNHits',
+ 'EcalEndcapNHitsContributions',
'EcalEndcapPHits',
+ 'EcalEndcapPHitsContributions',
'EcalBarrelHits',
+ 'EcalBarrelHitsContributions',
'EcalBarrelScFiHits',
+ 'EcalBarrelScFiHitsContributions',
'HcalBarrelHits',
+ 'HcalBarrelHitsContributions',
'HcalEndcapPHits',
+ 'HcalEndcapPHitsContributions',
'HcalEndcapNHits',
+ 'HcalEndcapNHitsContributions',
'DRICHHits',
]
--
GitLab