DaVinci:

 - make few minor adjustment for Turbo MC processing
 - reshuffle lines a bit to keep all (scattered) TurboConf-related actions in one place (could be useful in future to easily move these lines to TurboConf, if possible)

Phys/DaVinci/python/DaVinci/Configuration.py

@@ -189,9 +189,33 @@ class DaVinci(LHCbConfigurableUser) :
         self.setOtherProps(AnalysisConf(),["DataType","Simulation","InputType","RootInTES"])
         self.setOtherProps(DstConf(),["DataType","Turbo"])
         self.setOtherProps(TrackSys(),["DataType"])
+
+        
         if self.getProp("Turbo"):
+            
+            data_type = self.getProp('DataType')
+
+            if not self.isPropertySet("RootInTES") :
+                if self.getProp('Simulation') and '2015' == data_type :
+                    self.setProp('RootInTES','/Event/Turbo')
+                else : 
+                    raise DaVinciConfigurationError ( "You must set DaVinci().RootInTES when DaVinci().Turbo is `True`")
+            
+            if   self.getProp('Simulation') and '2015' == data_type : pass 
+            elif 'MDST' != self.getProp('InputType') :
+                log.info ("Forcing `InputType` to `'MDST'` as `Turbo` is `True`")
+                self.setProp ( "InputType" , "MDST")
+                
             self.setOtherProps(TurboConf(), ["DataType","Simulation","RootInTES"])
 
+            ##  why these lines  are here  and not in TurboConf ???
+            if data_type == "2016":
+                # Enable the decoding of the persisted reconstruction objects
+                TurboConf().RunPackedDataDecoder = True
+            if data_type in ["2016", "2017", "2018"]:
+                # Enable the unpacking of the persisted reconstruction objects
+                TurboConf().RunPersistRecoUnpacking = True                
+
     def _analysisSeq(self) :
         return GaudiSequencer('DaVinciAnalysisSeq', IgnoreFilterPassed = True)
 
@@ -405,19 +429,27 @@ class DaVinci(LHCbConfigurableUser) :
             if self.getProp("Simulation") :
                 DstConf().setProp("SimType","Full")
 
-        if self.getProp("Turbo"):
-            log.debug("Forcing `InputType` to `'MDST'` as `Turbo` is `True`")
-            self.setProp("InputType", "MDST")
-            if not self.getProp("RootInTES"):
-                raise DaVinciConfigurationError((
-                    "You must set DaVinci().RootInTES when DaVinci().Turbo is `True`"
-                ))
-            if self.getProp("DataType") == "2016":
-                # Enable the decoding of the persisted reconstruction objects
-                TurboConf().RunPackedDataDecoder = True
-            if self.getProp("DataType") in ["2016", "2017", "2018"]:
-                # Enable the unpacking of the persisted reconstruction objects
-                TurboConf().RunPersistRecoUnpacking = True
+        ## if self.getProp("Turbo"):
+
+        ##     data_type = self.getProp('DataType')
+            
+        ##     ##if not self.isPropertySet("RootInTES") :
+        ##     ## if not self.getProp("RootInTES"):
+        ##     ##    raise DaVinciConfigurationError((
+        ##     ##        "You must set DaVinci().RootInTES when DaVinci().Turbo is `True`"
+        ##     ##        ))
+                        
+        ##     if   self.getProp('Simulation') and '2015' == data_type : pass 
+        ##     elif 'MDST' != self.getProp('InputType') 
+        ##         log.info ("Forcing `InputType` to `'MDST'` as `Turbo` is `True`")
+        ##         self.setProp ( "InputType" , "MDST")
+                
+        ##     if data_type == "2016":
+        ##         # Enable the decoding of the persisted reconstruction objects
+        ##         TurboConf().RunPackedDataDecoder = True
+        ##     if data_type in ["2016", "2017", "2018"]:
+        ##         # Enable the unpacking of the persisted reconstruction objects
+        ##         TurboConf().RunPersistRecoUnpacking = True
 
         return inputType