From f28165a74c22d89045ad287f610496f13f1714f0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dkalinkin@bnl.gov>
Date: Thu, 9 Feb 2023 23:59:18 +0000
Subject: [PATCH] **/options: enable adjacencyMatrix in IslandCluster for
SciGlass
---
benchmarks/clustering/options/full_cal_reco.py | 6 +++++-
benchmarks/ecal/options/barrel.py | 6 +++++-
benchmarks/imaging_ecal/options/hybrid_cluster.py | 6 +++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index 519bd49a..299a78c3 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -258,7 +258,11 @@ else:
splitCluster=False,
minClusterHitEdep=1.0*MeV, # discard low energy hits
minClusterCenterEdep=30*MeV,
- sectorDist=5.0*cm)
+ # Magic constants:
+ # 24 - number of sectors
+ # 5 - number of towers per sector
+ adjacencyMatrix = "(abs(tower_1 - tower_2) + (abs((sector_1 - sector_2) * 5 + row_1 - row_2) == 1) + (abs((sector_1 - sector_2) * 5 + row_1 - row_2) == (24 * 5 - 1))) == 1",
+ readoutClass = "EcalBarrelSciGlassHits")
algs.append(cb_ecal_cl)
cb_ecal_clreco = ImagingClusterReco("cb_ecal_clreco",
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index dfee8083..6bfe72fc 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -161,7 +161,11 @@ else:
splitCluster=False,
minClusterHitEdep=1.0 * MeV, # discard low energy hits
minClusterCenterEdep=30 * MeV,
- sectorDist=5.0 * cm,
+ # Magic constants:
+ # 24 - number of sectors
+ # 5 - number of towers per sector
+ adjacencyMatrix = "(abs(tower_1 - tower_2) + (abs((sector_1 - sector_2) * 5 + row_1 - row_2) == 1) + (abs((sector_1 - sector_2) * 5 + row_1 - row_2) == (24 * 5 - 1))) == 1",
+ readoutClass = "EcalBarrelSciGlassHits",
)
algorithms.append(sciglass_ecal_cl)
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index 5c50009c..a457fe69 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -212,7 +212,11 @@ else:
splitCluster=False,
minClusterHitEdep=1.0*MeV, # discard low energy hits
minClusterCenterEdep=30*MeV,
- sectorDist=5.0*cm)
+ # Magic constants:
+ # 24 - number of sectors
+ # 5 - number of towers per sector
+ adjacencyMatrix = "(abs(tower_1 - tower_2) + (abs((sector_1 - sector_2) * 5 + row_1 - row_2) == 1) + (abs((sector_1 - sector_2) * 5 + row_1 - row_2) == (24 * 5 - 1))) == 1",
+ readoutClass = "EcalBarrelSciGlassHits")
algorithms.append(sciglass_ecal_cl)
sciglass_ecal_clreco = ImagingClusterReco("sciglass_ecal_clreco",
--
GitLab