Skip to content
Snippets Groups Projects
Commit 4944973c authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Merge branch 'cattanem-fixL0Decoding' into '2017-patches'

Use L0Conf instead of DecodersDB to set up decoding of L0Report

See merge request !1183
parents 7b0cb456 e1574c51
No related branches found
No related tags found
1 merge request!1183Use L0Conf instead of DecodersDB to set up decoding of L0Report
...@@ -9,7 +9,7 @@ __author__ = "Chris Jones <Christopher.Rob.Jones@cern.ch>" ...@@ -9,7 +9,7 @@ __author__ = "Chris Jones <Christopher.Rob.Jones@cern.ch>"
from RichKernel.Configuration import * from RichKernel.Configuration import *
from Configurables import ( RichAlignmentConf, RichRecSysConf, from Configurables import ( RichAlignmentConf, RichRecSysConf,
GaudiSequencer, MessageSvc ) L0Conf, GaudiSequencer, MessageSvc )
# ------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------
# Workaround for Configurables problem # Workaround for Configurables problem
...@@ -31,7 +31,7 @@ from Configurables import ( RichAlignmentConf, RichRecSysConf, ...@@ -31,7 +31,7 @@ from Configurables import ( RichAlignmentConf, RichRecSysConf,
class RichRecQCConf(RichConfigurableUser): class RichRecQCConf(RichConfigurableUser):
## Possible used Configurables ## Possible used Configurables
__used_configurables__ = [ (RichAlignmentConf,None), (RichRecSysConf,'RichOfflineRec') ] __used_configurables__ = [ (RichAlignmentConf,None), (RichRecSysConf,'RichOfflineRec'), L0Conf ]
## Default Histogram set ## Default Histogram set
__default_histo_set__ = "OfflineFull" __default_histo_set__ = "OfflineFull"
...@@ -302,12 +302,16 @@ class RichRecQCConf(RichConfigurableUser): ...@@ -302,12 +302,16 @@ class RichRecQCConf(RichConfigurableUser):
from Configurables import ( LoKi__HDRFilter, from Configurables import ( LoKi__HDRFilter,
LoKi__L0Filter, LoKi__L0Filter,
GaudiSequencer ) GaudiSequencer )
l0dec = GaudiSequencer("L0DecodeSeq")
L0Conf().L0Sequencer = l0dec
L0Conf().DecodeL0DU = True
self.setOtherProps( L0Conf(), ["DataType"] )
from DAQSys.Decoders import DecoderDB from DAQSys.Decoders import DecoderDB
from DAQSys.DecoderClass import decodersForBank
l0dec = [ d.setup() for d in decodersForBank(DecoderDB,'L0DU') ]
hltdec=DecoderDB["HltDecReportsDecoder/Hlt1DecReportsDecoder"].setup() hltdec=DecoderDB["HltDecReportsDecoder/Hlt1DecReportsDecoder"].setup()
return l0dec+ [ return [ l0dec,
LoKi__L0Filter("RichL0Filter", Code='L0_DECISION_PHYSICS'), LoKi__L0Filter("RichL0Filter", Code='L0_DECISION_PHYSICS'),
hltdec, hltdec,
LoKi__HDRFilter("RichHlt1Filter", LoKi__HDRFilter("RichHlt1Filter",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment