From 46825560d88962f1ce3669409d2073139edd2499 Mon Sep 17 00:00:00 2001
From: Lidija Zivkovic <lidija.zivkovic@cern.ch>
Date: Thu, 29 Nov 2018 13:13:26 +0100
Subject: [PATCH] ATR-19148: menu errors in master for FTK
---
Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py | 2 +-
.../TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py | 2 +-
.../TriggerMenu/python/menu/Physics_pp_v7_primaries.py | 3 ++-
.../TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
index c7dcc99d820..0426c0ba1d8 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
@@ -200,7 +200,7 @@ def setupMenu():
['mu6_idperf_FTK', 'L1_MU6', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu24_idperf_FTKRefit', 'L1_MU20', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu6_idperf_FTKRefit', 'L1_MU6', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
- ['mu18_mu8noL1_ftkFS', 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','mu8noL1_ftkFS']]],
+ ['mu18_mu8noL1_FTKFS', 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','mu8noL1_FTKFS']]],
['mu26_ivarmedium_ftk', 'L1_MU20', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
index 3c173c02538..5a3ad22cf79 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
@@ -255,7 +255,7 @@ def setupMenu():
['mu6_idperf_FTK_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu24_idperf_FTKRefit_L1MU20_FTK', 'L1_MU20_FTK', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu6_idperf_FTKRefit_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
- ['mu18_mu8noL1_ftkFS_L1MU15_FTK', 'L1_MU15_FTK', ['L1_MU15_FTK',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','mu8noL1_ftkFS']]],
+ ['mu18_mu8noL1_FTKFS_L1MU15_FTK', 'L1_MU15_FTK', ['L1_MU15_FTK',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','mu8noL1_FTKFS']]],
['mu26_ivarmedium_ftk_L1MU20_FTK', 'L1_MU20_FTK', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
]
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 2920c08f9ab..fd2ce53a521 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py
@@ -85,7 +85,8 @@ def setupMenu():
['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_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']]],
]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 27d5d51fba2..bd3a954c268 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -197,7 +197,7 @@ MuonChainParts = {
'reccalibInfo' : ['msonly', 'l2msonly', 'l2idonly', 'nomucomb', 'idperf','muoncalib', 'mucombTag','muL2', 'mgonly'],
'trkInfo' : ['fasttr', 'hlttr', 'ftk', 'IDT'],
'hypoInfo' : [],
- 'FSinfo' : ['ftkFS', 'nscan03', 'l2nscan03', 'nscan05', 'l2nscan05', 'JpsimumuFS', 'JpsimumuL2','calotag'],
+ 'FSinfo' : ['FTKFS', 'nscan03', 'l2nscan03', 'nscan05', 'l2nscan05', 'JpsimumuFS', 'JpsimumuL2','calotag'],
'L2IDAlg' : ['L2Star','IdScan','FTK','FTKRefit'],
'L2SAAlg' : ['muFast', 'l2muonSA',],
'L2CBAlg' : ['muComb',],
@@ -417,7 +417,7 @@ PhotonChainParts = {
'caloInfo' : ['HLTCalo'],
'hypoInfo' : '',
'recoAlg' : [],
- 'FSinfo' : ['ftkFS',],
+ 'FSinfo' : ['FTKFS',],
'addInfo' : ['etcut', 'jetcalibdelayed', 'cosmic', 'perf', 'hiptrt','ringer','conv','larpeb',],
}
--
GitLab