Possible fix of ATLASDQ-805

InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py

@@ -282,7 +282,7 @@ if DetFlags.haveRIO.SCT_on():
     InDetSCT_ReadCalibDataTool = sct_ReadCalibDataToolSetup.getTool()
     if (InDetFlags.doPrintConfigurables()):
         printfunc (InDetSCT_ReadCalibDataTool)
-    
+
     # Load flagged condition tool
     from SCT_ConditionsTools.SCT_FlaggedConditionToolSetup import SCT_FlaggedConditionToolSetup
     sct_FlaggedConditionToolSetup = SCT_FlaggedConditionToolSetup()
@@ -315,8 +315,9 @@ if DetFlags.haveRIO.SCT_on():
     sct_ByteStreamErrorsToolSetup = SCT_ByteStreamErrorsToolSetup()
     sct_ByteStreamErrorsToolSetup.setConfigTool(InDetSCT_ConfigurationConditionsTool)
     sct_ByteStreamErrorsToolSetup.setup()
+    SCT_ByteStreamErrorsTool = sct_ByteStreamErrorsToolSetup.getTool()
     if (InDetFlags.doPrintConfigurables()):
-        printfunc (sct_ByteStreamErrorsToolSetup.getTool())
+        printfunc (SCT_ByteStreamErrorsTool)
     
     if InDetFlags.useSctDCS():
         from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
@@ -344,31 +345,31 @@ if DetFlags.haveRIO.SCT_on():
             printfunc (InDetSCT_TdaqEnabledTool)
         
         # Configure summary tool
-        InDetSCT_ConditionsSummaryTool.ConditionsTools= [ sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
-                                                          sct_FlaggedConditionToolSetup.getTool().getFullName(),
-                                                          sct_ByteStreamErrorsToolSetup.getTool().getFullName(),
-                                                          sct_ReadCalibDataToolSetup.getTool().getFullName(),
-                                                          sct_TdaqEnabledToolSetup.getTool().getFullName()]
+        InDetSCT_ConditionsSummaryTool.ConditionsTools= [ InDetSCT_ConfigurationConditionsTool,
+                                                          InDetSCT_FlaggedConditionTool,
+                                                          SCT_ByteStreamErrorsTool,
+                                                          InDetSCT_ReadCalibDataTool,
+                                                          InDetSCT_TdaqEnabledTool ]
         if not athenaCommonFlags.isOnline():
-            InDetSCT_ConditionsSummaryTool.ConditionsTools += [ sct_MonitorConditionsToolSetup.getTool().getFullName() ]
+            InDetSCT_ConditionsSummaryTool.ConditionsTools += [ InDetSCT_MonitorConditionsTool ]
 
         if InDetFlags.useSctDCS():
-            InDetSCT_ConditionsSummaryTool.ConditionsTools += [ sct_DCSConditionsToolSetup.getTool().getFullName() ]
+            InDetSCT_ConditionsSummaryTool.ConditionsTools += [ InDetSCT_DCSConditionsTool ]
        
     # switch conditions off for SLHC usage
     elif InDetFlags.doSLHC():
         InDetSCT_ConditionsSummaryTool.ConditionsTools= []
       
     else :
-        InDetSCT_ConditionsSummaryTool.ConditionsTools= [ sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
-                                                          sct_FlaggedConditionToolSetup.getTool().getFullName(),
-                                                          sct_MonitorConditionsToolSetup.getTool().getFullName(),
-                                                          sct_ReadCalibDataToolSetup.getTool().getFullName()]
+        InDetSCT_ConditionsSummaryTool.ConditionsTools= [ InDetSCT_ConfigurationConditionsTool,
+                                                          InDetSCT_FlaggedConditionTool,
+                                                          InDetSCT_MonitorConditionsTool,
+                                                          InDetSCT_ReadCalibDataTool ]
         if InDetFlags.useSctDCS():
-            InDetSCT_ConditionsSummaryTool.ConditionsTools += [ sct_DCSConditionsToolSetup.getTool().getFullName() ]
+            InDetSCT_ConditionsSummaryTool.ConditionsTools += [ InDetSCT_DCSConditionsTool ]
 
     if InDetFlags.doSCTModuleVeto():
-        InDetSCT_ConditionsSummaryTool.ConditionsTools += [ sct_MonitorConditionsToolSetup.getTool().getFullName() ]
+        InDetSCT_ConditionsSummaryTool.ConditionsTools += [ InDetSCT_ModuleVetoTool ]
 
     # @TODO fix this temporary hack to make the configguration of the InDetSCT_ConditionsSummaryTool accessible to TrackingCommon
     import InDetRecExample.TrackingCommon as TrackingCommon
@@ -383,9 +384,9 @@ if DetFlags.haveRIO.SCT_on():
     InDetSCT_ConditionsSummaryToolWithoutFlagged = sct_ConditionsSummaryToolSetupWithoutFlagged.getTool()    
     condTools = []
     for condToolHandle in InDetSCT_ConditionsSummaryTool.ConditionsTools:
-        condTool = condToolHandle.typeAndName
+        condTool = condToolHandle
         if condTool not in condTools:
-            if condTool != InDetSCT_FlaggedConditionTool.getFullName():
+            if condTool != InDetSCT_FlaggedConditionTool:
                 condTools.append(condTool)
     InDetSCT_ConditionsSummaryToolWithoutFlagged.ConditionsTools = condTools