From 77e2a355a61cc6b5b7b5817b2ce143231fccb950 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 5 Jun 2023 18:57:25 -0500
Subject: [PATCH] fix: invert has_ecal_barrel_scfi logic
---
benchmarks/clustering/options/full_cal_reco.py | 10 +++++-----
benchmarks/ecal/options/barrel.py | 10 +++++-----
benchmarks/imaging_ecal/options/hybrid_cluster.py | 10 +++++-----
benchmarks/imaging_ecal/options/scfi_cluster.py | 10 +++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index daf4eb50..8be58592 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -17,11 +17,11 @@ detector_path = str(os.environ.get("DETECTOR_PATH", "."))
compact_path = os.path.join(detector_path, detector_config)
# Detector features that affect reconstruction
-has_ecal_barrel_scfi = False
-if 'epic' in detector_name and 'imaging' in detector_config:
- has_ecal_barrel_scfi = True
-if 'epic' in detector_name and 'brycecanyon' in detector_config:
- has_ecal_barrel_scfi = True
+has_ecal_barrel_scfi = True
+if "epic" in detector_name and "sciglass" in detector_config:
+ has_ecal_barrel_scfi = False
+if 'epic' in detector_name and 'arches' in detector_config:
+ has_ecal_barrel_scfi = False
# input arguments from calibration file
with open(f'{detector_path}/calibrations/emcal_barrel_calibration.json') as f:
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index 6bfe72fc..d6761f09 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -21,11 +21,11 @@ compact_path = str(
)
# Detector features that affect reconstruction
-has_ecal_barrel_scfi = False
-if "epic" in detector_name and "imaging" in detector_config:
- has_ecal_barrel_scfi = True
-if 'epic' in detector_name and 'brycecanyon' in detector_config:
- has_ecal_barrel_scfi = True
+has_ecal_barrel_scfi = True
+if "epic" in detector_name and "sciglass" in detector_config:
+ has_ecal_barrel_scfi = False
+if 'epic' in detector_name and 'arches' in detector_config:
+ has_ecal_barrel_scfi = False
# input and output
input_sims = [
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index a457fe69..dcb348d8 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -22,11 +22,11 @@ detector_version = str(os.environ.get("DETECTOR_VERSION", "main"))
detector_path = str(os.environ.get("DETECTOR_PATH", "."))
# Detector features that affect reconstruction
-has_ecal_barrel_scfi = False
-if 'epic' in detector_name and 'imaging' in detector_config:
- has_ecal_barrel_scfi = True
-if 'epic' in detector_name and 'brycecanyon' in detector_config:
- has_ecal_barrel_scfi = True
+has_ecal_barrel_scfi = True
+if "epic" in detector_name and "sciglass" in detector_config:
+ has_ecal_barrel_scfi = False
+if 'epic' in detector_name and 'arches' in detector_config:
+ has_ecal_barrel_scfi = False
# input arguments from calibration file
with open(f'{detector_path}/calibrations/emcal_barrel_calibration.json') as f:
diff --git a/benchmarks/imaging_ecal/options/scfi_cluster.py b/benchmarks/imaging_ecal/options/scfi_cluster.py
index a06d043e..8c7ede00 100644
--- a/benchmarks/imaging_ecal/options/scfi_cluster.py
+++ b/benchmarks/imaging_ecal/options/scfi_cluster.py
@@ -19,11 +19,11 @@ detector_version = str(os.environ.get("DETECTOR_VERSION", "main"))
detector_path = str(os.environ.get("DETECTOR_PATH", "."))
# Detector features that affect reconstruction
-has_ecal_barrel_scfi = False
-if 'epic' in detector_name and 'imaging' in detector_config:
- has_ecal_barrel_scfi = True
-if 'epic' in detector_name and 'brycecanyon' in detector_config:
- has_ecal_barrel_scfi = True
+has_ecal_barrel_scfi = True
+if "epic" in detector_name and "sciglass" in detector_config:
+ has_ecal_barrel_scfi = False
+if 'epic' in detector_name and 'arches' in detector_config:
+ has_ecal_barrel_scfi = False
# input arguments from calibration file
with open(f'{detector_path}/calibrations/emcal_barrel_calibration.json') as f:
--
GitLab