Further move bits from AnalysisConf to the DaVinci configurable

Depends on Analysis!713 (merged).

Phys/DaVinci/python/DaVinci/Configuration.py

@@ -116,7+116,7 @@
         LumiIntegratorConf,
         TurboConf         ,
         FlavourTaggingConf,
         LHCbApp           ]
 
     __legacy_datatypes__  = [ "MC09", "2008", "2009", "2010", "2011", "2012", "2015", "2016", "2017", "2018", ]
     __known_datatypes__ = ["Upgrade"]
@@ -371,7+371,7 @@
         """
         Analysis init Sequence.
         """
         # only one initialisiation do far
         from Configurables import GaudiSequencer
         init = GaudiSequencer("AnalysisInitSeq")
         self.redoMCLinks(init)
@@ -411,7+411,7 @@
                 mcLinkSeq.Members = [mcKillSeq, TrackAssociator()]
                 init.Members += [mcLinkSeq]
 
-# LoKi service
+    # LoKi service
     def loki(self):
         """
         Define the LoKi service.
@@ -419,23 +419,23 @@ class DaVinci(LHCbConfigurableUser) :
         from Configurables import LoKiSvc
         lokiService = LoKiSvc()
         ApplicationMgr().ExtSvc += [lokiService]
+        
+    #
+    # BTaggingTool configuration
+    #
+    def tagging(self):
+        # Just create an instance. Nothing to configure as of yet
+        ftConf = FlavourTaggingConf()
 
-#
-# BTaggingTool configuration
-#
-def tagging(self):
-    # Just create an instance. Nothing to configure as of yet
-    ftConf = FlavourTaggingConf()
-
-#
-# Standard Particles
-#
-def standardParticles(self):
-    """
-    define standard particles on DoD service
-    """
-    import CommonParticles.StandardBasic
-    import CommonParticles.StandardIntermediate
+    #
+    # Standard Particles
+    #
+    def standardParticles(self):
+        """
+        define standard particles on DoD service
+        """
+        import CommonParticles.StandardBasic
+        import CommonParticles.StandardIntermediate
 
 ################################################################################
 # Lumi setup