From 73f1a81d2f49f2765a57dc38e6efa2b603121a29 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 26 Mar 2021 11:26:44 -0400
Subject: [PATCH] CaloLocalHadCalib: Remove configuration references to
CaloNoiseTool.
CaloNoiseTool is no longer used by anything.
Remove attempts to configure it.
---
.../share/GetH6LCSinglePionsPerf_cbt.py | 11 -----------
Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py | 10 ----------
.../CaloLocalHadCalib/share/deadmaterialtree_ctb.py | 10 ----------
3 files changed, 31 deletions(-)
diff --git a/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py b/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py
index 8c4e725d132a..82263629bc39 100644
--- a/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py
+++ b/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py
@@ -126,17 +126,6 @@ if doTopoClusterAgain:
"TileExt0", "TileExt1", "TileExt2",
"TileGap1", "TileGap2", "TileGap3",
"FCAL0", "FCAL1"]
- # simple noise tool
- SimpleNoiseFile = "sigmas_all.dat"
- from CaloTools.CaloToolsConf import SimpleNoiseToolFromTextFile
- SimpleNoiseTool = SimpleNoiseToolFromTextFile("SimpleNoiseTool")
- SimpleNoiseTool.CellNoiseFileName = SimpleNoiseFile
- ToolSvc += SimpleNoiseTool
-
- topSequence.CaloTopoCluster.TopoMaker.CaloNoiseTool = SimpleNoiseTool
- topSequence.CaloTopoCluster.LocalCalib.LCWeight.CaloNoiseTool = SimpleNoiseTool
- topSequence.CaloTopoCluster.DMCalib.LCDeadMaterial.CaloNoiseTool = SimpleNoiseTool
-
# remove annoying BadChannel tool
tlist=[]
for x in topSequence.CaloTopoCluster.ClusterCorrectionTools:
diff --git a/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py b/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py
index d0559bb8aeb9..8102bdb397be 100644
--- a/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py
+++ b/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py
@@ -142,16 +142,6 @@ if doTopoClusterAgain:
"TileExt0", "TileExt1", "TileExt2",
"TileGap1", "TileGap2", "TileGap3",
"FCAL0", "FCAL1"]
- # simple noise tool
- SimpleNoiseFile = "sigmas_ave.dat"
- from CaloTools.CaloToolsConf import SimpleNoiseToolFromTextFile
- SimpleNoiseTool = SimpleNoiseToolFromTextFile("SimpleNoiseTool")
- SimpleNoiseTool.CellNoiseFileName = SimpleNoiseFile
- ToolSvc += SimpleNoiseTool
-
- topSequence.CaloTopoCluster.TopoMaker.CaloNoiseTool = SimpleNoiseTool
- topSequence.CaloTopoCluster.LocalCalib.LCWeight.CaloNoiseTool = SimpleNoiseTool
- topSequence.CaloTopoCluster.DMCalib.LCDeadMaterial.CaloNoiseTool = SimpleNoiseTool
# remove annoying BadChannel tool
tlist=[]
diff --git a/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py b/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py
index 22ec5d145ca5..923413a389b6 100644
--- a/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py
+++ b/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py
@@ -137,16 +137,6 @@ if doTopoClusterAgain:
"TileExt0", "TileExt1", "TileExt2",
"TileGap1", "TileGap2", "TileGap3",
"FCAL0", "FCAL1"]
- # simple noise tool
- SimpleNoiseFile = "sigmas_ave.dat"
- from CaloTools.CaloToolsConf import SimpleNoiseToolFromTextFile
- SimpleNoiseTool = SimpleNoiseToolFromTextFile("SimpleNoiseTool")
- SimpleNoiseTool.CellNoiseFileName = SimpleNoiseFile
- ToolSvc += SimpleNoiseTool
-
- topSequence.CaloTopoCluster.TopoMaker.CaloNoiseTool = SimpleNoiseTool
- topSequence.CaloTopoCluster.LocalCalib.LCWeight.CaloNoiseTool = SimpleNoiseTool
- topSequence.CaloTopoCluster.DMCalib.LCDeadMaterial.CaloNoiseTool = SimpleNoiseTool
# remove annoying BadChannel tool
tlist=[]
--
GitLab