From aa1fa13c9838a030d8e4c9544dfcbc3b799bae2e Mon Sep 17 00:00:00 2001
From: Bertrand Martin Dit Latour <bertrand.martindl@cern.ch>
Date: Sun, 2 Oct 2022 20:55:47 +0200
Subject: [PATCH] add timeCutUpperLimit flag for topoclusters
introduce timeCutUpperLimit flag for topoclusters
Hello,
This MR is introducing a 'timeCutUpperLimit' flag for topoclusters, with a default value of 20, in order to avoid hardcoded numbers in several places (ATLPHYSVAL-825).
This cut could possibly be tuned in specific domains, like pi0 reconstruction for taus, but until then, it's better to have a central flag controlling this.
I also added the timing cut to the CA configuration for pi0 topoclustering for taus, which was missing.
Cheers,
Bertrand
---
.../CaloRec/python/CaloClusterTopoGetter.py | 2 +-
Calorimeter/CaloRec/python/CaloConfigFlags.py | 1 +
.../CaloRec/python/CaloTopoClusterConfig.py | 2 +-
.../CaloRec/python/CaloTopoClusterFlags.py | 15 ++++++++++++---
.../python/SubtractedCaloClusterTopoGetter.py | 4 ++--
Reconstruction/tauRec/python/TauToolHolder.py | 6 ++++++
.../tauRec/share/Pi0ClusterMaker_jobOptions.py | 2 +-
7 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py b/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
index 3bee11446d5c..19abbaa981f4 100644
--- a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
+++ b/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
@@ -368,7 +368,7 @@ class CaloClusterTopoGetter ( Configured ) :
TopoMaker.SeedCutsInT = jobproperties.CaloTopoClusterFlags.doTimeCut()
TopoMaker.CutOOTseed = jobproperties.CaloTopoClusterFlags.extendTimeCut() and jobproperties.CaloTopoClusterFlags.doTimeCut()
TopoMaker.UseTimeCutUpperLimit = jobproperties.CaloTopoClusterFlags.useUpperLimitForTimeCut()
- TopoMaker.TimeCutUpperLimit = 20.0
+ TopoMaker.TimeCutUpperLimit = jobproperties.CaloTopoClusterFlags.timeCutUpperLimit()
# note E or AbsE
#
diff --git a/Calorimeter/CaloRec/python/CaloConfigFlags.py b/Calorimeter/CaloRec/python/CaloConfigFlags.py
index 97fa67a45f7a..7130ff64dd22 100644
--- a/Calorimeter/CaloRec/python/CaloConfigFlags.py
+++ b/Calorimeter/CaloRec/python/CaloConfigFlags.py
@@ -23,6 +23,7 @@ def createCaloConfigFlags():
ccf.addFlag("Calo.TopoCluster.doTimeCut", False)
ccf.addFlag("Calo.TopoCluster.extendTimeCut", False)
ccf.addFlag("Calo.TopoCluster.useUpperLimitForTimeCut", False)
+ ccf.addFlag("Calo.TopoCluster.timeCutUpperLimit", 20.0)
ccf.addFlag("Calo.TopoCluster.writeExtendedClusterMoments",True)
#### Cluster correction flags:
# If true, then reweight cells to prevent double-counting between clusters.
diff --git a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
index ce7f4dc78899..ed7ccfe59e93 100644
--- a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
+++ b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
@@ -258,7 +258,7 @@ def CaloTopoClusterToolCfg(configFlags, cellsname):
TopoMaker.SeedCutsInT = configFlags.Calo.TopoCluster.doTimeCut
TopoMaker.CutOOTseed = configFlags.Calo.TopoCluster.extendTimeCut and configFlags.Calo.TopoCluster.doTimeCut
TopoMaker.UseTimeCutUpperLimit = configFlags.Calo.TopoCluster.useUpperLimitForTimeCut
- TopoMaker.TimeCutUpperLimit = 20.0
+ TopoMaker.TimeCutUpperLimit = configFlags.Calo.TopoCluster.timeCutUpperLimit
# note E or AbsE
#
diff --git a/Calorimeter/CaloRec/python/CaloTopoClusterFlags.py b/Calorimeter/CaloRec/python/CaloTopoClusterFlags.py
index 8870666a20b1..efcddf5d77b8 100644
--- a/Calorimeter/CaloRec/python/CaloTopoClusterFlags.py
+++ b/Calorimeter/CaloRec/python/CaloTopoClusterFlags.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
# $Id: CaloTopoClusterFlags.py,v 1.5 2009-05-04 16:23:04 lochp Exp $
@@ -119,19 +119,27 @@ class doTimeCut(JobProperty):
class extendTimeCut(JobProperty):
- """
+ """
"""
statusOn=True
allowedTypes=['bool']
StoredValue=False
class useUpperLimitForTimeCut(JobProperty):
- """
+ """
"""
statusOn=True
allowedTypes=['bool']
StoredValue=False
+class timeCutUpperLimit(JobProperty):
+ """
+ """
+ statusOn=True
+ allowedTypes=['float']
+ StoredValue=20.0
+
+
# add the flags container to the top container
jobproperties.add_Container(CaloTopoClusterFlags)
@@ -155,6 +163,7 @@ list_jobproperties = [
,doTimeCut
,extendTimeCut
,useUpperLimitForTimeCut
+ ,timeCutUpperLimit
]
for i in list_jobproperties:
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/python/SubtractedCaloClusterTopoGetter.py b/Reconstruction/HeavyIonRec/HIJetRec/python/SubtractedCaloClusterTopoGetter.py
index 9b7133c84605..9fa94094cf5f 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/python/SubtractedCaloClusterTopoGetter.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/python/SubtractedCaloClusterTopoGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
# Getter class duplicated from CaloRec/python/CaloClusterTopoGetter.py, in order to create a topo cluster collection using UE subtracted cells
# exact version at https://gitlab.cern.ch/qhu/athena/-/blob/50cbc0b97a726b71b3bb0e02d9c4f5fb09ee900a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
# please refer to the original version for details settings of clustering and calibration
@@ -293,7 +293,7 @@ class SubtractedCaloClusterTopoGetter ( Configured ) :
TopoMaker.SeedCutsInT = jobproperties.CaloTopoClusterFlags.doTimeCut()
TopoMaker.CutOOTseed = jobproperties.CaloTopoClusterFlags.extendTimeCut() and jobproperties.CaloTopoClusterFlags.doTimeCut()
TopoMaker.UseTimeCutUpperLimit = jobproperties.CaloTopoClusterFlags.useUpperLimitForTimeCut()
- TopoMaker.TimeCutUpperLimit = 20.0
+ TopoMaker.TimeCutUpperLimit = jobproperties.CaloTopoClusterFlags.timeCutUpperLimit()
# note E or AbsE
#
diff --git a/Reconstruction/tauRec/python/TauToolHolder.py b/Reconstruction/tauRec/python/TauToolHolder.py
index 3df12d8dd618..f3669eaba58e 100644
--- a/Reconstruction/tauRec/python/TauToolHolder.py
+++ b/Reconstruction/tauRec/python/TauToolHolder.py
@@ -539,6 +539,12 @@ def TauCaloTopoClusterMakerCfg(flags):
TopoClusterForTaus.SeedCutsInAbsE = True
TopoClusterForTaus.ClusterEtorAbsEtCut = 0.5*GeV # 0.0*MeV in standard CaloCalTopoCluster JobOptions!
TopoClusterForTaus.TwoGaussianNoise = flags.Calo.TopoCluster.doTwoGaussianNoise
+ # timing cut on seed cell
+ TopoClusterForTaus.SeedCutsInT = flags.Calo.TopoCluster.doTimeCut
+ TopoClusterForTaus.CutOOTseed = flags.Calo.TopoCluster.extendTimeCut and flags.Calo.TopoCluster.doTimeCut
+ TopoClusterForTaus.UseTimeCutUpperLimit = flags.Calo.TopoCluster.useUpperLimitForTimeCut
+ # may have to be tuned for EM clusters and/or LLP->tau reconstruction
+ TopoClusterForTaus.TimeCutUpperLimit = flags.Calo.TopoCluster.timeCutUpperLimit
result.setPrivateTools(TopoClusterForTaus)
return result
diff --git a/Reconstruction/tauRec/share/Pi0ClusterMaker_jobOptions.py b/Reconstruction/tauRec/share/Pi0ClusterMaker_jobOptions.py
index a9798a471642..30242681c392 100644
--- a/Reconstruction/tauRec/share/Pi0ClusterMaker_jobOptions.py
+++ b/Reconstruction/tauRec/share/Pi0ClusterMaker_jobOptions.py
@@ -236,7 +236,7 @@ TopoClusterForTaus.SeedCutsInT = jobproperties.CaloTopoClusterFlags.doTimeCut()
TopoClusterForTaus.CutOOTseed = jobproperties.CaloTopoClusterFlags.extendTimeCut() and jobproperties.CaloTopoClusterFlags.doTimeCut()
TopoClusterForTaus.UseTimeCutUpperLimit = jobproperties.CaloTopoClusterFlags.useUpperLimitForTimeCut()
# may have to be tuned for EM clusters and/or LLP->tau reconstruction
-TopoClusterForTaus.TimeCutUpperLimit = 20.0
+TopoClusterForTaus.TimeCutUpperLimit = jobproperties.CaloTopoClusterFlags.timeCutUpperLimit()
TopoSplitterForTaus = CaloTopoClusterSplitter("TauPi0TopoSplitter")
# cells from the following samplings will be able to form local
--
GitLab