From 472f42cb0b8d4fe8966ac60ebe16ee17a2f77a0f Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 30 Jun 2022 15:07:41 -0500
Subject: [PATCH] Use has_ecal_barrel_scfi
---
benchmarks/imaging_ecal/options/hybrid_cluster.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index 50329c06..731c33d3 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -16,10 +16,18 @@ from Configurables import Jug__Reco__ImagingTopoCluster as ImagingTopoCluster
from Configurables import Jug__Reco__ImagingClusterReco as ImagingClusterReco
detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_config = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", detector_name))
detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
detector_path = str(os.environ.get("DETECTOR_PATH", "."))
+# Detector features that affect reconstruction
+has_ecal_barrel_scfi = False
+if 'athena' in detector_name:
+ has_ecal_barrel_scfi = True
+if 'ecce' in detector_name and 'imaging' in detector_config:
+ has_ecal_barrel_scfi = True
+
# input arguments from calibration file
with open(f'{detector_path}/calibrations/emcal_barrel_calibration.json') as f:
calib_data = json.load(f)['electron']
@@ -57,7 +65,7 @@ ecal_barrel_scfi_collections = [
'EcalBarrelScFiHits',
'EcalBarrelScFiHitsContributions'
]
-if 'athena' in detector_name:
+if has_ecal_barrel_scfi:
sim_colls += ecal_barrel_scfi_collections
# list of algorithms
@@ -68,7 +76,7 @@ algorithms.append(podin)
# Central Barrel Ecal
-if 'athena' in detector_name:
+if has_ecal_barrel_scfi:
# Central ECAL Imaging Calorimeter
# use the same daq_setting for digi/reco pair
--
GitLab