From 30a696409bd0509b0bdcb4782d04712d1ed8c242 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 7 Aug 2023 22:53:08 +0000
Subject: [PATCH] fix: rename imaging/scfi module to sector
---
benchmarks/clustering/options/full_cal_reco.py | 6 +++---
benchmarks/imaging_ecal/options/hybrid_cluster.py | 6 +++---
benchmarks/imaging_ecal/options/imaging_2dcluster.py | 2 +-
benchmarks/imaging_ecal/options/imaging_topocluster.py | 2 +-
benchmarks/imaging_ecal/options/scfi_cluster.py | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index 8be58592..8bf69c4c 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -205,7 +205,7 @@ if has_ecal_barrel_scfi:
thresholdFactor=3, # about 20 keV
readoutClass="EcalBarrelImagingHits", # readout class
layerField="layer", # field to get layer id
- sectorField="module", # field to get sector id
+ sectorField="sector", # field to get sector id
samplingFraction=cb_ecal_sf,
**cb_ecal_daq)
algs.append(cb_ecal_reco)
@@ -290,8 +290,8 @@ if has_ecal_barrel_scfi:
thresholdFactor=5.0,
readoutClass="EcalBarrelScFiHits",
layerField="layer",
- sectorField="module",
- localDetFields=["system", "module"], # use local coordinates in each module (stave)
+ sectorField="sector",
+ localDetFields=["system", "sector"], # use local coordinates in each sector
samplingFraction=scifi_barrel_sf,
**scfi_barrel_daq)
algs.append(scfi_barrel_reco)
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index dcb348d8..1abbc750 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -106,7 +106,7 @@ if has_ecal_barrel_scfi:
outputHitCollection='RecoEcalBarrelImagingHits',
readoutClass='EcalBarrelImagingHits',
layerField='layer',
- sectorField='module',
+ sectorField='sector',
samplingFraction=kwargs['img_sf'],
**imcaldaq)
algorithms.append(imcalreco)
@@ -149,8 +149,8 @@ if has_ecal_barrel_scfi:
thresholdFactor=5.0,
readoutClass="EcalBarrelScFiHits",
layerField="layer",
- sectorField="module",
- localDetFields=["system", "module"], # use local coordinates in each module (stave)
+ sectorField="sector",
+ localDetFields=["system", "sector"], # use local coordinates in each sector
samplingFraction=kwargs['scfi_sf'],
**scfi_barrel_daq)
algorithms.append(scfi_barrel_reco)
diff --git a/benchmarks/imaging_ecal/options/imaging_2dcluster.py b/benchmarks/imaging_ecal/options/imaging_2dcluster.py
index 03a371f0..614eec91 100644
--- a/benchmarks/imaging_ecal/options/imaging_2dcluster.py
+++ b/benchmarks/imaging_ecal/options/imaging_2dcluster.py
@@ -57,7 +57,7 @@ imcal_barrel_reco = CalHitReco('imcal_barrel_reco',
outputHitCollection='EcalBarrelImagingHitsReco',
thresholdFactor=5.0,
readoutClass='EcalBarrelImagingHits',
- localDetFields=['system', 'module'], # use local coordinates in each module (stave)
+ localDetFields=['system', 'sector'], # use local coordinates in each sector
**imcal_barrel_daq)
# merge hits to eta, phi bins
diff --git a/benchmarks/imaging_ecal/options/imaging_topocluster.py b/benchmarks/imaging_ecal/options/imaging_topocluster.py
index 1194838a..dc6349b8 100644
--- a/benchmarks/imaging_ecal/options/imaging_topocluster.py
+++ b/benchmarks/imaging_ecal/options/imaging_topocluster.py
@@ -57,7 +57,7 @@ imcalreco = ImagingPixelReco("imcal_reco",
outputHitCollection="RecoEcalBarrelImagingHits",
readoutClass="EcalBarrelImagingHits",
layerField="layer",
- sectorField="module",
+ sectorField="sector",
**daq_setting)
imcalcluster = ImagingTopoCluster("imcal_cluster",
diff --git a/benchmarks/imaging_ecal/options/scfi_cluster.py b/benchmarks/imaging_ecal/options/scfi_cluster.py
index 8c7ede00..80345fab 100644
--- a/benchmarks/imaging_ecal/options/scfi_cluster.py
+++ b/benchmarks/imaging_ecal/options/scfi_cluster.py
@@ -86,8 +86,8 @@ if has_ecal_barrel_scfi:
thresholdFactor=5.0,
readoutClass="EcalBarrelScFiHits",
layerField="layer",
- sectorField="module",
- localDetFields=["system", "module"], # use local coordinates in each module (stave)
+ sectorField="sector",
+ localDetFields=["system", "sector"], # use local coordinates in each sector
**scfi_barrel_daq)
algorithms.append(scfi_barrel_reco)
--
GitLab