Merge branch 'DVconfig_upgrade' into 'master'

Cleaning DV configuration for Upgrade

See merge request !431

Phys/DaVinci/python/DaVinci/Configuration.py

@@ -57,7 +57,6 @@ class DaVinci(LHCbConfigurableUser) :
         , "RootCompressionLevel" : "LZMA:6"        # ROOT compression level for ntuple files
         # DQ
         , "IgnoreDQFlags"      : False           # If False (default), process only events with good DQ.
-        #, "IgnoredDQFlags"     : []              # List of particular DQ flags to ignore.
         # Monitoring
         , "MoniSequence"       : []              # Add your monitors here
         # DaVinci Options
@@ -94,7 +93,6 @@ class DaVinci(LHCbConfigurableUser) :
         , 'MergeGenFSR'        : """ Flags whether to merge the generatore level FSRs """
         , "RootCompressionLevel" : """ ROOT Compression level for ntuples """
         , 'IgnoreDQFlags'      : """ If False, process only events with good DQ. Default is False """
-        #, "IgnoredDQFlags"     : """ List of DQ flags to ignore. Default is empty, so events flagged bad for any reason are rejected (Unless IgnoreDQFlags=True) """
         , "MainOptions"        : """ Main option file to execute """
         , "UserAlgorithms"     : """ User algorithms to run. """
         , "RedoMCLinks"        : """ On some stripped DST one needs to redo the Track<->MC link table. Set to true if problems with association. """
@@ -120,7 +118,6 @@ class DaVinci(LHCbConfigurableUser) :
 
     __legacy_datatypes__  = [ "MC09", "2008", "2009", "2010", "2011", "2012", "2015", "2016", "2017", "2018", ]
     __known_datatypes__ = ["Upgrade"]
-    __known_default_detectors =  ['Velo', 'PuVeto', 'Rich1', 'Rich2', 'TT', 'IT', 'OT', 'Spd', 'Prs', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']
     __known_upgrade_detectors__ = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr' ]
 
     __known_TurboStreams = {
@@ -139,10 +136,6 @@ class DaVinci(LHCbConfigurableUser) :
         'Leptonic', 'Charm', 'PID', 'Bhadron', 'ALLMDST', 'AllStreams'
     }
 
-
-    ## Known monitoring sequences run by default
-    KnownMonitors        = []
-
     mainSeq = GaudiSequencer("DaVinciUserSequence")
     moniSeq = GaudiSequencer("MonitoringSequence")
 
@@ -290,7 +283,7 @@ class DaVinci(LHCbConfigurableUser) :
 
 
 ################################################################################
-# Configure slaves
+# Configure sub-packages
 #
     def _configureSubPackages(self):
         """
@@ -365,17 +358,6 @@ class DaVinci(LHCbConfigurableUser) :
             AnalysisConf().RedoMCLinks = self.getProp("RedoMCLinks")
             analysisinit = AnalysisConf().initSequence()
             initSeqs = [physinit,analysisinit]
-#        if inputType == 'RDST' :
-#            log.info('Setting HltDecReportsDecoders RawEventLocations to ["pRec/RawEvent"]')
-#            from DAQSys.Decoders import DecoderDB
-#            from DAQSys.DecoderClass import decodersForBank
-#            for bank in ["Sel","Dec","Vertex","Track"]:
-#                for d in decodersForBank(DecoderDB,"Hlt"+bank+"Reports"):
-#                    d.overrideInputs("pRec/RawEvent")
-#                    #d.setup()
-#            from Configurables import ANNDispatchSvc
-#
-#            ANNDispatchSvc().RawEventLocation = "pRec/RawEvent"
 
         return GaudiSequencer('DaVinciEventInitSeq',
                               Members = initSeqs,
@@ -678,7 +660,6 @@ class DaVinci(LHCbConfigurableUser) :
         Monitoring sequence
         """
         self.moniSeq.IgnoreFilterPassed = True
-        self.moniSeq.Members = self.KnownMonitors
         self._analysisSeq().Members += [ self.moniSeq ]
         log.info("Creating Moni Algorithms")
         self.appendToMoniSequence( self.getProp("MoniSequence") )
@@ -698,7 +679,7 @@ class DaVinci(LHCbConfigurableUser) :
                 log.info ('Define CondDB( Upgrade = True ) ')
                 _db.Upgrade = True
             if  not self.isPropertySet('Detectors') or not self.getProp('Detectors') :
-                upgrade_only_dets = [ d for d in self.__known_upgrade_detectors__ if d not in self.__known_default_detectors]
+                upgrade_only_dets = self.__known_upgrade_detectors__
                 log.warning("It is suspicious that the list of ``Detectors'' is not specified though ``DataType=Upgrade'' ...")
                 log.warning("Sure that none of the upgrade-only detectors %s are to be specified via ``Detectors''?" % upgrade_only_dets )
             from Configurables import SimConf