diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py index cd748a61be636b33ccfc4bcce1c6ae06955450d6..b957a7ffafd24c3efdf610875c4fb67faf73a13e 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py @@ -154,13 +154,13 @@ class L2EFChain_Beamspot(L2EFChainDef): from TrigInDetConf.TrigInDetSequence import TrigInDetSequence [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", sequenceFlavour=["FTF"]).getSequence() from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence - [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "mon").getSequence() - if 'mon' in self.chainPart['addInfo']: + [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", ["mon"]).getSequence() + elif 'mon' in self.chainPart['addInfo']: from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence - [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "mon").getSequence() + [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", ["mon"]).getSequence() else: from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence - [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "").getSequence() + [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", [""]).getSequence() teaddition = 'trkFTK' elif ('FTKRefit' in self.l2IDAlg): @@ -185,10 +185,10 @@ class L2EFChain_Beamspot(L2EFChainDef): from TrigInDetConf.TrigInDetSequence import TrigInDetSequence [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", sequenceFlavour=["FTF"]).getSequence() from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence - [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "refit").getSequence() + [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", ["refit"]).getSequence() else: from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence - [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "refit").getSequence() + [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", ["refit"]).getSequence() teaddition = 'trkFTKRefit' else: diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py index 1f1b965a83a5e1db2b3c3b03bddf96beee38f189..33dbb61adf9520ad2b0659a7daf74dc22a814f82 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py @@ -85,19 +85,16 @@ def setupMenu(): if TriggerFlags.doFTK(): TriggerFlags.MuonSlice.signatures = TriggerFlags.MuonSlice.signatures() + [ - ['mu6_idperf_FTK_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1], - ['mu6_idperf_FTKRefit_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1], + ['mu26_ivarmedium_FTK_L1MU20MU21_FTK', 'L1_MU20_FTK', ['L1_MU20_FTK'], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1], ['mu6_idperf_FTK_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1], ['mu6_idperf_FTKRefit_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1], # ['mu22_mu8noL1_FTKFS_L1MU20MU21_FTK', 'L1_MU20MU21_FTK', ['L1_MU20_FTK',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1_FTKFS']]], ['mu22_mu8noL1_FTKFS_L1MU20_FTK', 'L1_MU20_FTK', [], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1_FTKFS']]], - ] - TriggerFlags.JetSlice.signatures = [ @@ -434,10 +431,8 @@ def setupMenu(): if TriggerFlags.doFTK(): TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures() + [ - ['beamspot_idperf_FTK_L14J20_FTK', 'L1_4J20_FTK', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], ['beamspot_idperf_FTKRefit_L14J20_FTK', 'L1_4J20_FTK', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], - ]