From fb3ba6fea385392480dadda1d1c51f64e406ea69 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 26 Mar 2021 11:56:17 -0400
Subject: [PATCH] TrigTauRec: Remove references to CaloNoiseTool.
Remove vestigial references to obsolete CaloNoiseTool.
Remove some obsolete/unused configuration functions.
---
.../python/TrigTauAlgorithmsHolder.py | 67 -------------------
1 file changed, 67 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py
index e68a07385825..d4ef23f52f3a 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py
@@ -889,44 +889,6 @@ def getTauCellCorrection():
cached_instances[_name] = TauCellCorrectionTool
return TauCellCorrectionTool
-#########################################################################
-# CaloNoiseTool
-def getCaloNoiseTool():
- _name = 'CaloNoiseTool'
-
- if _name in cached_instances:
- return cached_instances[_name]
-
- from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
- theCaloNoiseTool = CaloNoiseToolDefault()
-
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += theCaloNoiseTool
-
- cached_instances[_name] = theCaloNoiseTool
- return theCaloNoiseTool
-
-#########################################################################
-# tau1p3p track match cells
-def getTauEflowTrackMatchCells():
- _name = sPrefix + 'EflowTrackMatchCells'
-
- if _name in cached_instances:
- return cached_instances[_name]
-
- from tauRec.tauRecConf import TauEflowTrackMatchCells
- TauEflowTrackMatchCells = TauEflowTrackMatchCells(name = _name,
- detRIsolCaloCut = 0.4,
- useNoiseSigma = 1,
- AbsNoiseSigma_cut = 2,
- CaloNoiseTool = getCaloNoiseTool(),
- selectConeSize = 0.45, #not used anymore
- CellCorrection = True,
- OriginCorrectionTool = getTauCellCorrection())
-
- cached_instances[_name] = TauEflowTrackMatchCells
- return TauEflowTrackMatchCells
-
#########################################################################
# tau1p3p AddCaloInfo
def getTauEflowAddCaloInfo():
@@ -1001,35 +963,6 @@ def getPi0CreatorChooser():
cached_instances[_name] = TauPi0CreatorChooser
return TauPi0CreatorChooser
-#########################################################################
-# Crakow Pi0/eflow algorithm
-# Cluster/Cellfinder for Pi0/Eflow algos
-def getPi0EflowCreateROI():
- _name = sPrefix + 'TauPi0EflowCreateROI'
-
- if _name in cached_instances:
- return cached_instances[_name]
-
- from tauRec.tauRecConf import TauPi0EflowCreateROI
- TauPi0EflowCreateROI = TauPi0EflowCreateROI( name = _name,
- detRIsolCaloCut = 0.4,
- detRCoreCaloCut = 0.2,
- useNoiseSigma = 0,
- AbsNoiseSigma_cut = 2,
- removeChrgEM01 = 1,
- removeChrgEM2 = 1,
- detRChrgEMCut = 0.0375,
- # Added by SL
- fillCellContainer = TRUE,
- CellsOutputContainerName = "TauCells",
- CaloNoiseTool = getCaloNoiseTool(),
- CaloCellMakerToolNames = ["CaloCellContainerFinalizerTool/cellfinalizerForTaus","CaloCellContainerCheckerTool/cellcheckForTaus"],
- CellCorrection = True,
- OriginCorrectionTool = getTauCellCorrection())
-
- cached_instances[_name] = TauPi0EflowCreateROI
- return TauPi0EflowCreateROI
-
################
# Pi0 Clustering
def getCrakowPi0ClusterCreator():
--
GitLab