Updated TRT_ElectronPidToolsConfig

Updated TRT_ElectronPidToolsConfig

InnerDetector/InDetConfig/python/TRT_ElectronPidToolsConfig.py

@@ -60,26 +60,33 @@ def __TRT_dEdxToolBaseCfg(flags, name, **kwargs):
     acc = TRTToTCondAlgCfg(flags)
 
     kwargs.setdefault("TRT_dEdx_isData", not flags.Input.isMC)
-    
-    if "TRT_LocalOccupancyTool" not in kwargs:
-        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(TRT_LocalOccupancyCfg(flags)))
-
-    if "AssociationTool" not in kwargs:
-        from InDetConfig.InDetAssociationToolsConfig import InDetPrdAssociationToolCfg
-        kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(InDetPrdAssociationToolCfg(flags)))
 
     acc.setPrivateTools(CompFactory.TRT_ToT_dEdx(name,**kwargs))
     return acc
 
+
 def TRT_dEdxToolCfg(flags, name="TRT_dEdxTool", **kwargs):
-    acc = __TRT_dEdxToolBaseCfg(flags, name, **kwargs)
+    acc = ComponentAccumulator()
     
     if not flags.Input.isMC:
         from LumiBlockComps.LumiBlockMuWriterConfig import LumiBlockMuWriterCfg
         acc.merge(LumiBlockMuWriterCfg(flags))
 
+    if "TRT_LocalOccupancyTool" not in kwargs:
+        kwargs.setdefault("TRT_LocalOccupancyTool", acc.popToolsAndMerge(
+            TRT_LocalOccupancyCfg(flags)))
+
+    if "AssociationTool" not in kwargs:
+        from InDetConfig.InDetAssociationToolsConfig import (
+            InDetPrdAssociationToolCfg)
+        kwargs.setdefault("AssociationTool", acc.popToolsAndMerge(
+            InDetPrdAssociationToolCfg(flags)))
+
+    acc.setPrivateTools(acc.popToolsAndMerge(
+        __TRT_dEdxToolBaseCfg(flags, name, **kwargs)))
     return acc
 
+
 def TrigTRT_dEdxToolCfg(flags, name="TrigTRT_dEdxTool", **kwargs):
     """trigger version should not add LumiBlockMuWriterCfg to views as it is scheduled globally"""