From 8d96daffda43a53e920d4cc84ebd4ba9d8ad5440 Mon Sep 17 00:00:00 2001 From: Roel Aaij <raaij@nikhef.nl> Date: Mon, 25 Apr 2016 15:18:49 +0200 Subject: [PATCH 1/2] Rename TurboFull to TurboRaw and add DstData to be kept by Turbo stripper. --- Hlt/HltConf/python/HltConf/HltOutput.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hlt/HltConf/python/HltConf/HltOutput.py b/Hlt/HltConf/python/HltConf/HltOutput.py index bf851d1ce..19c4e2e6c 100644 --- a/Hlt/HltConf/python/HltConf/HltOutput.py +++ b/Hlt/HltConf/python/HltConf/HltOutput.py @@ -35,7 +35,7 @@ class HltOutputConf(LHCbConfigurableUser): ## Streams we know about: {name : rb} __streams__ = {"VELOCLOSING" : 40, "HLT1NOBIAS" : 48, - "TURBOFULL" : 85, + "TURBORAW" : 85, "BEAMGAS" : 86, "FULL" : 87, "TURBO" : 88, @@ -60,9 +60,9 @@ class HltOutputConf(LHCbConfigurableUser): (["PARKED"], []), (["NOBIAS"], []), (["SMOGPHYS"], []), - (["TURBOFULL"], []), + (["TURBORAW"], []), (["LUMI"], ['ODIN', 'HltLumiSummary', 'HltRoutingBits', 'DAQ']), - (["TURBO"],['ODIN', 'HltLumiSummary', 'DAQ', + (["TURBO"],['ODIN', 'HltLumiSummary', 'DAQ', 'DstData', 'HltRoutingBits', 'HltDecReports', 'HltSelReports', 'HltVertexReports', 'HltTrackReports', 'L0DU', 'L0Calo', 'L0PU', 'L0PUFull', 'L0Muon', 'L0CaloFull', 'L0MuonCtrlAll', 'L0MuonProcCand', 'L0MuonProcData', 'L0MuonCtrlAll'])], @@ -70,11 +70,11 @@ class HltOutputConf(LHCbConfigurableUser): "BEAMGAS" : None, "FULL" : None, "TURBO" : None, - "TURBOFULL" : None, + "TURBORAW" : None, "TURCAL" : None, "VELOCLOSING" : None, "HLT1NOBIAS" : None}, - 'StreamsWithLumi' : ['FULL', 'TURCAL', 'TURBO', 'TURBOFULL', 'NOBIAS', 'SMOGPHYS', 'PARKED'], + 'StreamsWithLumi' : ['FULL', 'TURCAL', 'TURBO', 'TURBORAW', 'NOBIAS', 'SMOGPHYS', 'PARKED'], 'OutputAlgProperties' : None, 'HltEndSequence' : None, 'LumiPredicate' : "HLT_PASS('Hlt2LumiDecision')", -- GitLab From 7e613f957c5720ff6e60d860b1ca9d528eba090d Mon Sep 17 00:00:00 2001 From: Roel Aaij <raaij@nikhef.nl> Date: Mon, 25 Apr 2016 18:12:08 +0200 Subject: [PATCH 2/2] Remove duplicate entry in Turbo banks. --- Hlt/HltConf/python/HltConf/HltOutput.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/HltConf/python/HltConf/HltOutput.py b/Hlt/HltConf/python/HltConf/HltOutput.py index 19c4e2e6c..812b23f71 100644 --- a/Hlt/HltConf/python/HltConf/HltOutput.py +++ b/Hlt/HltConf/python/HltConf/HltOutput.py @@ -65,7 +65,7 @@ class HltOutputConf(LHCbConfigurableUser): (["TURBO"],['ODIN', 'HltLumiSummary', 'DAQ', 'DstData', 'HltRoutingBits', 'HltDecReports', 'HltSelReports', 'HltVertexReports', 'HltTrackReports', 'L0DU', 'L0Calo', 'L0PU', 'L0PUFull', 'L0Muon', 'L0CaloFull', - 'L0MuonCtrlAll', 'L0MuonProcCand', 'L0MuonProcData', 'L0MuonCtrlAll'])], + 'L0MuonCtrlAll', 'L0MuonProcCand', 'L0MuonProcData'])], 'EnabledStreams' : {"LUMI" : None, "BEAMGAS" : None, "FULL" : None, -- GitLab