diff --git a/Phys/DaVinci/python/DaVinci/Configuration.py b/Phys/DaVinci/python/DaVinci/Configuration.py index c75d5af4c37db33332b8596695c983c3d66eab09..f3647803e6aa38a33247008243c1c7d512a3ea94 100644 --- a/Phys/DaVinci/python/DaVinci/Configuration.py +++ b/Phys/DaVinci/python/DaVinci/Configuration.py @@ -1,5 +1,5 @@ ############################################################################### -# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration # +# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration # # # # This software is distributed under the terms of the GNU General Public # # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # @@ -17,7 +17,7 @@ __author__ = "Juan Palacios <juan.palacios@nikhef.nl>" from LHCbKernel.Configuration import * from Configurables import GaudiSequencer from Configurables import ( LHCbConfigurableUser, LHCbApp, - PhysConf, AnalysisConf, TrackSys , + PhysConf, AnalysisConf, DstConf, L0Conf, LumiAlgsConf, TurboConf ) from LumiAlgs.LumiIntegratorConf import LumiIntegratorConf import GaudiKernel.ProcessJobOptions @@ -108,7 +108,6 @@ class DaVinci(LHCbConfigurableUser) : __used_configurables__ = [ PhysConf , AnalysisConf , - TrackSys , DstConf , L0Conf , LumiAlgsConf , @@ -201,8 +200,6 @@ class DaVinci(LHCbConfigurableUser) : self.setOtherProps(PhysConf(),["DataType","Simulation","InputType","Detectors"]) self.setOtherProps(AnalysisConf(),["DataType","Simulation","InputType","RootInTES"]) self.setOtherProps(DstConf(),["DataType","Turbo"]) - self.setOtherProps(TrackSys(),["DataType"]) - if self.getProp("Turbo"): diff --git a/Phys/Tesla/python/Tesla/Configuration.py b/Phys/Tesla/python/Tesla/Configuration.py index 5b4f68413c975e1421e5a6452da61817f1c82e3d..dcf677f53be677fac61e8fc92c031194cf6976c9 100644 --- a/Phys/Tesla/python/Tesla/Configuration.py +++ b/Phys/Tesla/python/Tesla/Configuration.py @@ -1,5 +1,5 @@ ############################################################################### -# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration # +# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration # # # # This software is distributed under the terms of the GNU General Public # # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # @@ -67,7 +67,6 @@ from Configurables import ( TimingAuditor, TrackAssociator, TrackClonerWithClusters, - TrackSys, TurboConf, TurboPrescaler, UnpackCaloHypo as UnpackCaloHypos, @@ -147,7 +146,7 @@ def _strip_root(root, locs): class Tesla(LHCbConfigurableUser): - __used_configurables__ = [ LHCbApp, LumiAlgsConf, RawEventJuggler, DecodeRawEvent, RawEventFormatConf, DstConf, RecombineRawEvent, PackParticlesAndVertices, TrackAssociator, ChargedPP2MC, TrackSys, TurboConf] + __used_configurables__ = [ LHCbApp, LumiAlgsConf, RawEventJuggler, DecodeRawEvent, RawEventFormatConf, DstConf, RecombineRawEvent, PackParticlesAndVertices, TrackAssociator, ChargedPP2MC, TurboConf] __slots__ = { "EvtMax" : -1 # Maximum number of events to process @@ -1387,7 +1386,6 @@ class Tesla(LHCbConfigurableUser): def __apply_configuration__(self): ############## Set other properties ########### self._safeSet( LHCbApp(), ['EvtMax','SkipEvents','Simulation', 'DataType' , 'CondDBtag','DDDBtag'] ) - self._safeSet( TrackSys(), ['DataType'] ) self._safeSet( TurboConf(), ['DataType'] ) # Make sure DQFlags are ignored for Tesla productions