Further move bits from AnalysisConf to the DaVinci configurable

Depends on Analysis!713 (merged).

Phys/DaVinci/python/DaVinci/Configuration.py

@@ -16,8 +16,8 @@ from LHCbKernel.Configuration import *
 from Configurables import GaudiSequencer
 from Configurables import ( LHCbConfigurableUser, LHCbApp,
                             PhysConf, AnalysisConf,
-                            DstConf, LumiAlgsConf, TurboConf )
-from Configurables import DataOnDemandSvc
+                            DstConf, LumiAlgsConf, TurboConf, FlavourTaggingConf )
+from Configurables import ToolSvc, DataOnDemandSvc
 from LumiAlgs.LumiIntegratorConf import LumiIntegratorConf
 import GaudiKernel.ProcessJobOptions
 
@@ -424,7 +424,6 @@ class DaVinci(LHCbConfigurableUser) :
 # BTaggingTool configuration
 #
 def tagging(self):
-    from Configurables import FlavourTaggingConf
     # Just create an instance. Nothing to configure as of yet
     ftConf = FlavourTaggingConf()
 
@@ -498,8 +497,9 @@ def standardParticles(self):
         from Configurables import (ApplicationMgr,
                                    AuditorSvc,
                                    SequencerTimerTool)
+        from Configurables import TimingAuditor, SequencerTimerTool
 
-        ApplicationMgr().ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
+        ApplicationMgr().ExtSvc += [ 'AuditorSvc' ]
         ApplicationMgr().AuditAlgorithms = True
         AuditorSvc().Auditors += [ 'TimingAuditor' ]
         SequencerTimerTool().OutputLevel = 4
@@ -511,7 +511,6 @@ def standardParticles(self):
         EventSelector().PrintFreq = printfreq
 
         # Change the column size of Timing table
-        from Configurables import TimingAuditor, SequencerTimerTool
         TimingAuditor().addTool(SequencerTimerTool,name="TIMER")
         if not TimingAuditor().TIMER.isPropertySet("NameSize"):
             TimingAuditor().TIMER.NameSize = 50