From e9e36faf891244a38ffd5b6177538a8918c8c39e Mon Sep 17 00:00:00 2001
From: Lidia Dell'Asta <dellasta@cern.ch>
Date: Wed, 31 May 2017 12:25:45 +0200
Subject: [PATCH] fixing muon FTK chain naming (ATR-16389)
---
Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py | 4 ++--
.../TriggerMenu/python/menu/Physics_pp_v7.py | 4 ++--
.../TriggerMenu/python/menu/SignatureDicts.py | 4 ++--
Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
index 824780c4f64c..71d8de0ba414 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
@@ -154,8 +154,8 @@ def setupMenu():
['mu6_idperf_FTK', 'L1_MU6', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu24_idperf_FTKRefit', 'L1_MU21', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu6_idperf_FTKRefit', 'L1_MU6', [], [PhysicsStream, 'express'], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
- ['mu22_mu8noL1_ftkFS', 'L1_MU21', ['L1_MU21',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1_ftkFS']]],
- ['mu26_ivarmedium_ftk', 'L1_MU21', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+ ['mu22_mu8noL1_FTKFS', 'L1_MU21', ['L1_MU21',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1_FTKFS']]],
+ ['mu26_ivarmedium_FTK', 'L1_MU21', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
]
TriggerFlags.JetSlice.signatures = TriggerFlags.JetSlice.signatures() + [
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
index d9184de1ed0e..2649d2608237 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
@@ -279,8 +279,8 @@ def setupMenu():
['mu6_idperf_FTK_L1MU6_FTK', 'L1_MU6_FTK', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon', 'BW:ID'], -1],
['mu24_idperf_FTKRefit_L1MU21_FTK', 'L1_MU21_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],
- ['mu22_mu8noL1_ftkFS_L1MU21_FTK', 'L1_MU21_FTK', ['L1_MU21_FTK',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1_ftkFS']]],
- ['mu26_ivarmedium_ftk_L1MU21_FTK', 'L1_MU21_FTK', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+ ['mu22_mu8noL1_FTKFS_L1MU21_FTK', 'L1_MU21_FTK', ['L1_MU21_FTK',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1_FTKFS']]],
+ ['mu26_ivarmedium_FTK_L1MU21_FTK', 'L1_MU21_FTK', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index c96756069ff8..39567d73e025 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -204,9 +204,9 @@ MuonChainParts = {
'IDinfo' : [],
'isoInfo' : ['iloose', 'imedium', 'itight', 'ivarloose', 'ivarmedium','icalo','iloosecalo','imediumcalo','iloosems', 'ivarloosecalo', 'ivarmediumcalo'],
'reccalibInfo' : ['msonly', 'l2msonly', 'l2idonly', 'nomucomb', 'idperf','muoncalib', 'mucombTag','muL2', 'mgonly'],
- 'trkInfo' : ['fasttr', 'hlttr', 'ftk', 'IDT'],
+ 'trkInfo' : ['fasttr', 'hlttr', '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',],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
index 771bf57efa74..f4df4145910d 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
@@ -101,7 +101,7 @@ class L2EFChain_mu(L2EFChainDef):
self.doOvlpRm = False
if "nscan" in self.chainName or "bTau" in self.chainName :
self.doOvlpRm = False
- elif "ftkFS" in self.chainPart['FSinfo']:
+ elif "FTKFS" in self.chainPart['FSinfo']:
self.setup_muXX_noL1FTK()
elif (self.mult > 1) & ('wOvlpRm' in self.ovlpRm):
self.doOvlpRm = True
@@ -356,7 +356,7 @@ class L2EFChain_mu(L2EFChainDef):
EFinputTE = 'L2_mu_hypo2'
# Run also FTK tracking
- if self.chainPart['trkInfo'] == "ftk":
+ if "FTK" in self.chainPart['L2IDAlg']:
from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence
[ftktrkfast, ftktrkprec] = TrigInDetFTKSequence("Muon","muonIso",sequenceFlavour=["PT"]).getSequence()
@@ -496,7 +496,7 @@ class L2EFChain_mu(L2EFChainDef):
self.L2signatureList += [ [['L2_mu_step2']*self.mult] ]
self.L2signatureList += [ [['L2_mu_hypo2']*self.mult] ]
- if self.chainPart['trkInfo'] == 'ftk':
+ if "FTK" in self.chainPart['L2IDAlg']:
self.L2signatureList += [ [['L2_mu_step3']*self.mult] ]
self.L2signatureList += [ [['L2_mu_step4']*self.mult] ]
self.L2signatureList += [ [['L2_mu_hypo3']*self.mult] ]
@@ -534,7 +534,7 @@ class L2EFChain_mu(L2EFChainDef):
'EF_mu_step1': mergeRemovingOverlap('EF_EFIDInsideOut_', self.chainPartNameNoMult+'_'+self.L2InputTE),
'EF_mu_step2': mergeRemovingOverlap('EF_SuperEF_', self.chainPartNameNoMult+'_'+self.L2InputTE),
}
- if self.chainPart['trkInfo'] == "ftk":
+ if "FTK" in self.chainPart['L2IDAlg']:
self.TErenamingDict.update({'L2_mu_step3': mergeRemovingOverlap('EF_ftkfex_',self.chainPartNameNoMult+'_'+self.L2InputTE),
'L2_mu_step4': mergeRemovingOverlap('EF_ftkiso_',self.chainPartNameNoMult+'_'+self.L2InputTE),
'L2_mu_hypo3': mergeRemovingOverlap('EF_ftkhypo_',self.chainPartNameNoMult+'_'+self.L2InputTE),
--
GitLab