diff --git a/MicroDST/MicroDSTConf/python/MicroDSTConf/TriggerConfUtils.py b/MicroDST/MicroDSTConf/python/MicroDSTConf/TriggerConfUtils.py index 743dbc14d9f75a4fcce9bc757f9b84d82f6170db..1e7c18808d3a2a3223209bc258504a777ac60e24 100644 --- a/MicroDST/MicroDSTConf/python/MicroDSTConf/TriggerConfUtils.py +++ b/MicroDST/MicroDSTConf/python/MicroDSTConf/TriggerConfUtils.py @@ -9,8 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### -__all__ = ('configureHltReportDecoding', 'configureL0ReportDecoding', - 'configureL0FromRawBank', 'configureL0AndHltDecoding') +__all__ = ('configureHltReportDecoding', 'configureHltDecoding') from Configurables import DataOnDemandSvc, ApplicationMgr @@ -68,57 +67,6 @@ def configureHltReportDecoding(trunk): #DataOnDemandSvc().AlgMap[decReportLoc] = decReportsDecoder -def configureL0ReportDecoding(trunk): - """ - Create L0DecReports and L0SelReports on-demand. Places the reports in trunk + HltLikeL0/DecReports and trunk + HltLikeL0/SelReports respectively. - """ - - from Configurables import L0DecReportsMaker, L0SelReportsMaker - - locationRoot = fixTrunk(trunk) - name = trunkName(trunk) - - DataOnDemandSvc().AlgMap[locationRoot + - "HltLikeL0/DecReports"] = L0DecReportsMaker( - name="L0DecReportsMaker" + name, - RootInTES=locationRoot) - DataOnDemandSvc().AlgMap[locationRoot + - "HltLikeL0/SelReports"] = L0SelReportsMaker( - name="L0SelReportsMaker" + name, - RootInTES=locationRoot) - - -def configureL0FromRawBank(trunk): - """ - Build L0 Muon, Calo candidates and L0DUReport from raw banks on-demand. Puts data in trunk + <standard locations> - """ - from Configurables import L0Conf - L0Conf().FullL0MuonDecoding = True - L0Conf().EnableL0DecodingOnDemand = True - - from Configurables import (L0MuonCandidatesFromRaw, - L0CaloCandidatesFromRaw, L0DUDecoder) - - locationRoot = fixTrunk(trunk) - name = trunkName(trunk) - - DataOnDemandSvc().AlgMap[locationRoot + - "Trig/L0/MuonBCSU"] = L0MuonCandidatesFromRaw( - name="L0MuonFromRaw" + name, - RootInTES=locationRoot) - DataOnDemandSvc().AlgMap[locationRoot + - "Trig/L0/FullCalo"] = L0CaloCandidatesFromRaw( - name="L0CaloFromRaw" + name, - RootInTES=locationRoot) - - DataOnDemandSvc().AlgMap[locationRoot + - "Trig/L0/L0DUReport"] = L0DUDecoder( - name="L0DUDecoder" + name, - RootInTES=locationRoot) - - -def configureL0AndHltDecoding(trunk): +def configureHltDecoding(trunk): configureHltReportDecoding(trunk) - configureL0ReportDecoding(trunk) - configureL0FromRawBank(trunk) diff --git a/Phys/PhysConf/python/PhysConf/MicroDST.py b/Phys/PhysConf/python/PhysConf/MicroDST.py index c97069613e774c441cdfe81a852eadb544d11f17..287df9f0447b3b71ce8693a1bd5b5b5f1663a5aa 100644 --- a/Phys/PhysConf/python/PhysConf/MicroDST.py +++ b/Phys/PhysConf/python/PhysConf/MicroDST.py @@ -131,7 +131,7 @@ def uDstConf(rootInTes, killNodes=None, logger=None): # ## configure L0,Hlt,e tc using Juan's functions: # - TCU.configureL0AndHltDecoding(rootInTes) + TCU.configureHltDecoding(rootInTes) logger.info("Configure L0&HLT decoding RootInTES='%s'" % rootInTes) from Configurables import DataOnDemandSvc