Merge branch 'cherry-pick-bea25013' into '2018-patches'

Cherry-pick MR !198 to 2018-patches branch

See merge request !203

Phys/Tesla/python/Tesla/Configuration.py

@@ -1347,7 +1347,7 @@ class Tesla(LHCbConfigurableUser):
         else:
             DecodeRawEvent().DataOnDemand=True
             RecombineRawEvent(Version=self.getProp('SplitRawEventInput'))
-            if self.getProp('Simulation')==True:
+            if self.getProp('DataType') in ['2015', '2016'] and self.getProp('Simulation')==True:
                 self._unpackMC()
                 TurboConf().setProp("PersistReco",True)
                 # We don't want the PersistReco reconstruction under