diff --git a/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py b/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py index 8c4e725d132a86ac773257f7b1862283be8c41d7..82263629bc3982e25e6b0c42ed5f5a9bb2d30391 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 d0559bb8aeb9106e68b86bd0dd48be89c8460614..8102bdb397bebf6cde9de282225e3ef31e16babb 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 22ec5d145ca5cba291cd9988690306395c42998d..923413a389b63ac4b3f57c974c0f88fbd6cd3e35 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=[]