From fe37aab272de85d97b0101f6503a40ded8e06259 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 16 Apr 2017 05:28:11 +0200
Subject: [PATCH] TileRec: Fix for private tools.
Tools used by CaloCellMaker are private now.
Correct places where we were still attempting to configure
them as public tools.
---
.../TileRec/share/TileCellMaker_jobOptions.py | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/TileCalorimeter/TileRec/share/TileCellMaker_jobOptions.py b/TileCalorimeter/TileRec/share/TileCellMaker_jobOptions.py
index 55c91c1354f..059c6dbcf14 100755
--- a/TileCalorimeter/TileRec/share/TileCellMaker_jobOptions.py
+++ b/TileCalorimeter/TileRec/share/TileCellMaker_jobOptions.py
@@ -43,13 +43,8 @@ if n3 == 100:
ToolSvc += theTileCellNoiseFilter
theCaloCellMaker.CaloCellMakerToolNames += [ ToolSvc.TileCellNoiseFilter.getFullName() ]
-if not hasattr( ToolSvc, "CaloCellContainerFinalizerTool" ):
- from CaloRec.CaloRecConf import CaloCellContainerFinalizerTool
- theCaloCellContainerFinalizerTool=CaloCellContainerFinalizerTool()
- ToolSvc += theCaloCellContainerFinalizerTool
- theCaloCellMaker.CaloCellMakerToolNames += [theCaloCellContainerFinalizerTool ]
-else:
- theCaloCellMaker.CaloCellMakerToolNames += ["CaloCellContainerFinalizerTool"]
+from CaloRec.CaloRecConf import CaloCellContainerFinalizerTool
+theCaloCellMaker.CaloCellMakerToolNames += [ CaloCellContainerFinalizerTool() ]
if ('doCaloNeighborsCorr' in dir()) and doCaloNeighborsCorr:
if not hasattr( ToolSvc, "CaloCellNeighborsAverageCorr" ):
@@ -63,13 +58,8 @@ if ('doCaloNeighborsCorr' in dir()) and doCaloNeighborsCorr:
else:
doCaloNeighborsCorr=False
-if not hasattr( ToolSvc, "CaloCellContainerCheckerTool" ):
- from CaloRec.CaloRecConf import CaloCellContainerCheckerTool
- theCaloCellContainerCheckerTool=CaloCellContainerCheckerTool()
- ToolSvc += theCaloCellContainerCheckerTool
- theCaloCellMaker.CaloCellMakerToolNames += [theCaloCellContainerCheckerTool]
-else:
- theCaloCellMaker.CaloCellMakerToolNames += ["CaloCellContainerCheckerTool"]
+from CaloRec.CaloRecConf import CaloCellContainerCheckerTool
+theCaloCellMaker.CaloCellMakerToolNames += [CaloCellContainerCheckerTool()]
print theCaloCellMaker
--
GitLab