From 91b176db5bbef445511b030a2ef87c1830ae9e14 Mon Sep 17 00:00:00 2001
From: rewang <r.jiewang@gmail.com>
Date: Thu, 27 Sep 2018 13:58:20 +0200
Subject: [PATCH] update MET triggers with LAr holes
Former-commit-id: 2f72d86d13ea9f9c84825235db67434f4b88cf7b
---
.../TrigEFMissingET/python/TrigEFMissingETConfig.py | 2 +-
.../TrigMissingETHypo/python/TrigMissingETHypoConfig.py | 4 ++--
Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETConfig.py b/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETConfig.py
index dd86f355a1b..1dfe8707708 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETConfig.py
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETConfig.py
@@ -1375,7 +1375,7 @@ class EFMissingET_Fex_topoClustersPUC (EFMissingETBase):
super(EFMissingET_Fex_topoClustersPUC, self).__init__(name)
# name of TrigMissingET object
- self.MissingETOutputKey = "TrigEFMissingET_topocl_PUC"
+ self.MissingETOutputKey = "TrigEFMissingET_topocl_PUC" if 'LAr' not in name else "TrigEFMissingET_"+name
self.doTopoClusters = True
self.doPUC = True
self.doJetVeto = True
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfig.py b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfig.py
index 02a2ad1b89d..9797ad74057 100755
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfig.py
@@ -311,13 +311,13 @@ class EFMetHypoFTKTrackAndJetsXE (EFMissingETHypoBase):
class EFMetHypoTCPUCXE (EFMissingETHypoBase):
__slots__ = []
- def __init__(self, name = "EFMetHypo_tcpucxe1000",ef_thr=1000*GeV):
+ def __init__(self, name = "EFMetHypo_tcpucxe1000",ef_thr=1000*GeV,labelMET = ""):
super( EFMetHypoTCPUCXE, self ).__init__( name )
self.SumETCut=ef_thr
self.MissingETCut=ef_thr
self.CutType=-2.0
- self.METLabel='TrigEFMissingET_topocl_PUC'
+ self.METLabel='TrigEFMissingET_topocl_PUC' if 'LAr' not in labelMET else 'TrigEFMissingET_EFMissingET_Fex_topoClustersPUC'+labelMET
self.doMuonCorrection = False
self.SumETCut = 100000000*GeV
self.forceAccept=False
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
index ede7b608dc1..f169b883ac5 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
@@ -186,13 +186,16 @@ class L2EFChain_met(L2EFChainDef):
jpt_thr = '-1'
if len(addInfo.split('Jpt'))==2: jpt_thr = addInfo.split('Jpt')[1]
+ if "Jpt" in addInfo:
+ LArTag += '_Jpt'+jpt_thr
+
#MET fex
theEFMETFex = EFMissingET_Fex_topoClustersPUC("EFMissingET_Fex_topoClustersPUC%s"%(addInfo),doLArH11off,doLArH12off,float(jpt_thr))
#Muon correction fex
theEFMETMuonFex = EFTrigMissingETMuon_Fex_topoclPUC()
mucorr= '_wMu' if EFmuon else ''
- theEFMETHypo = EFMetHypoTCPUCXE('EFMetHypo_TCPUC'+LArTag+'_xe%s_tc%s%s'%(threshold,calibration,mucorr),ef_thr=float(threshold)*GeV)
+ theEFMETHypo = EFMetHypoTCPUCXE('EFMetHypo_TCPUC'+LArTag+'_xe%s_tc%s%s'%(threshold,calibration,mucorr),ef_thr=float(threshold)*GeV,labelMET=addInfo)
if EFrecoAlg=='pufittrack':
--
GitLab