diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py index 6bf9576d7b9ebe442df04422731ff6a718db0148..9181d352864d23155563c6da4bb9c945e0eaddd1 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py @@ -161,6 +161,34 @@ class L2EFChain_Beamspot(L2EFChainDef): [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "").getSequence() teaddition = 'trkFTK' + elif ('FTKRefit' in self.l2IDAlg): + if 'trkFS' in self.chainPart['addInfo'] : + from TrigT2BeamSpot.T2VertexBeamSpotConfig import T2VertexBeamSpot_FTK + theFex = T2VertexBeamSpot_FTK() + elif 'activeTE' in self.chainPart['addInfo']: + from TrigT2BeamSpot.T2VertexBeamSpotConfig import T2VertexBeamSpot_activeTE_FTK + theFex = T2VertexBeamSpot_activeTE_FTK() + elif 'allTE' in self.chainPart['addInfo']: + from TrigT2BeamSpot.T2VertexBeamSpotConfig import T2VertexBeamSpot_activeAllTE_FTK + theFex = T2VertexBeamSpot_activeAllTE_FTK() + elif 'idperf' in self.chainPart['addInfo']: + from TrigT2BeamSpot.T2VertexBeamSpotConfig import T2VertexBeamSpot_activeAllTE_FTK + theFex = T2VertexBeamSpot_activeAllTE_FTK() + from TrigFTK_Monitoring.FtkHltEfficiencyConfig import FtkHltEfficiencyFex + moni_alg = FtkHltEfficiencyFex() + else: + mlog.error('Cannot assemble chain %s - only configured for trkFS,allTE and activeTE' % (self.chainPartName)) + + if 'idperf' in self.chainPart['addInfo']: + from TrigInDetConf.TrigInDetSequence import TrigInDetSequence + [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", "FTF").getSequence() + from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence + [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "refit").getSequence() + else: + from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence + [trk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "refit").getSequence() + teaddition = 'trkFTKRefit' + else: mlog.error('Cannot assemble chain %s - only configured for L2StarB' % (self.chainPartName)) diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py index 44981d6d64397283482a73e29bd25a197100bb53..1441dd6975d1ff6660696e971117d25338512467 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py @@ -610,8 +610,6 @@ def defineCPSGroups(): if "v6" in TriggerFlags.triggerMenuSetup() or "v7" in TriggerFlags.triggerMenuSetup(): HLT_CPS_Groups.update({ - - 'RATE:CPS:HLT_mu10_mu6_bBmumuX' : ['mu10_mu6_bBmumuxv2', 'mu10_mu6_bBmumux_BcmumuDsloose', 'mu10_mu6_bBmumux_BpmumuKp', @@ -827,13 +825,51 @@ def defineCPSGroups(): # 'RATE:CPS:HLT_2mu4_bBmumu_L1BPH-2M8-2MU4-BO_BPH-0DR15-2MU4' : ['2mu4_bBmumu_L1BPH-2M8-2MU4-BO_BPH-0DR15-2MU4', # '2mu4_bBmumu_L1BPH-2M8-2MU4-B_BPH-0DR15-2MU4', # ], - - - - - }) + if "v7" in TriggerFlags.triggerMenuSetup(): + HLT_CPS_Groups.update({ + 'RATE:CPS:HLT_j300_a10_sub_L1J75':[ 'j300_a10_sub_L1J75', + 'j300_a10_lcw_subjes_L1J75', + 'j300_a10r_L1J75', + # 'j300_a10_lcw_sub_L1SC85' ## can this work?? + # 'j300_a10_lcw_L1SC85' ## can this work?? + ], + + 'RATE:CPS:HLT_j260_a10_sub_L1J75':[ 'j260_a10_sub_L1J75', + 'j260_a10_lcw_sub_L1J75', + 'j260_a10_lcw_nojcalib_L1J75', + 'j260_a10_lcw_subjes_L1J75', + 'j260_a10_nojcalib_L1J75', + 'j260_a10r_L1J75', + # 'j260_a10_lcw_sub_L1SC85' ## can this work?? + # 'j260_a10_lcw_L1SC85' ## can this work?? + ], + + 'RATE:CPS:HLT_j360_a10L1J100' : [ 'j360_a10r_L1J100' , + 'j360_a10_lcw_subjes_L1J100',], + 'RATE:CPS:HLT_j380_a10L1J100' : [ 'j380_a10r_L1J100' , + 'j380_a10_lcw_subjes_L1J100',], + 'RATE:CPS:HLT_j400_a10' : ['j400_a10_lcw_subjes_L1J100', + #'j400_a10_lcw_sub_L1J100', + #'j400_a10_sub_L1J100', + 'j400_a10r_L1J100', + ], + 'RATE:CPS:HLT_j420_a10' : ['j420_a10_lcw_subjes_L1J100', + #'j420_a10_lcw_sub_L1J100', + #'j420_a10_sub_L1J100', + 'j420_a10r_L1J100', + ], + + 'RATE:CPS:HLT_j440_a10' : ['j440_a10_lcw_subjes_L1J100', + #'j440_a10_lcw_sub_L1J100', + 'j440_a10r_L1J100', + ], + 'RATE:CPS:HLT_j460_a10L1J100' : [ 'j460_a10_sub_L1J100', + 'j460_a10_nojcalib_L1J100', + 'j460_a10_lcw_nojcalib_L1J100', + 'j460_a10_lcw_sub_L1J100', + 'j460_a10_lcw_subjes_L1J100',],}) return (HLT_CPS_Groups) def addCPS(triggerPythonConfig,signatureOverwritten): diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py index 14851a3e638dde89ff7cd4e90b1179f455f134d4..cfb4886c6121495511e6f8627c55a42f6a4b85e8 100755 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py @@ -245,6 +245,8 @@ def setupMenu(): ['j55_j55_320eta490_L1RD0_FILLED', 'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jet'], -1], ['j85_j85_320eta490', 'L1_J20_J20.31ETA49', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jet'], -1], + ['j125', 'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j85_L1J40', 'L1_J40', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], # test chains # ['j85_test1', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], @@ -810,6 +812,9 @@ def setupMenu(): ['xe110_pufit_L1XE60', 'L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], ['xe110_mht_L1XE60', 'L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + #['xe50_mht_L1XE20', 'L1_XE20',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + ['xe90_mht_L1XE40', 'L1_XE40',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + ### ATR- 15096 ['xe110_pufit_wEFMu_L1XE60', 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py index 3bc39462cf332ebc5986f7ba85699172f7f9a818..ea72f961d09f127138af62f1f7beef95f4112d1c 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py @@ -219,8 +219,8 @@ def setupMenu(): ['j440_a10_lcw_sub_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ### ATR-14353 - ['j300_a10_lcw_L1SC85', 'L1_SC85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j360_a10_lcw_L1SC111', 'L1_SC111', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j300_a10_lcw_subjes_L1SC85', 'L1_SC85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j360_a10_lcw_subjes_L1SC111', 'L1_SC111', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], # trimming chains ['j460_a10t_nojcalib_L1J100', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1], @@ -314,6 +314,9 @@ def setupMenu(): ['j175_lcw_nojcalib', 'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j175_nojcalib', 'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j125', 'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j85_L1J40', 'L1_J40', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j200', 'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j200_jes_PS', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], @@ -787,6 +790,9 @@ def setupMenu(): ['xe110_pufit_L1XE60', 'L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], ['xe110_mht_L1XE60', 'L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + #['xe50_mht_L1XE20', 'L1_XE20',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + ['xe90_mht_L1XE40', 'L1_XE40',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], + ### ATR- 15096 ['xe110_pufit_wEFMu_L1XE60', 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1], @@ -2481,9 +2487,9 @@ def setupMenu(): ] #Beamspot chanis first try ATR-9847 - TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures() + [ - - ] + TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures()+ [ + ] + if TriggerFlags.doFTK(): TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures() + [ @@ -2491,6 +2497,8 @@ def setupMenu(): # ['beamspot_activeTE_FTK', 'L1_4J15', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], ['beamspot_idperf_FTK', 'L1_4J15', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], ['beamspot_trkFS_FTK', 'L1_4J15', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], + ['beamspot_trkFS_FTKRefit', 'L1_4J15', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], + ['beamspot_idperf_FTKRefit', 'L1_4J15', [], ["BeamSpot"], ['RATE:BeamSpot', 'BW:BeamSpot'], -1], ] ## The following slices are only needed for Physics runnings and LS1 menus @@ -3324,9 +3332,9 @@ ps_perform_list = [ 'j0_perf_boffperf_L1J12_EMPTY', 'j0_perf_boffperf_L1MU10', 'j0_perf_boffperf_L1RD0_EMPTY', - 'j15_boffperf_split', - 'j15_bperf_split', - 'j25_boffperf_split', + #'j15_boffperf_split', + #'j15_bperf_split', + #'j25_boffperf_split', 'j35_bperf_3j35', 'j25_bperf_split', 'j45_bperf_split', diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py index 203c84fd8f8accf4d9e46000985b5fc4ad5712e3..827147da9e31e03302945d5d9e13084054c5a3aa 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py @@ -393,13 +393,13 @@ def setupMenu(): ['j260_a10_nojcalib_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j260_a10_sub_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j260_a10_lcw_sub_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j260_a10_lcw_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j260_a10_lcw_subjes_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j260_a10_lcw_nojcalib_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], # Not yet in L1 menu ['j260_a10_lcw_L1SC85', 'L1_SC85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], # Not yet in L1 menu ['j260_a10_lcw_nojcalib_L1SC85', 'L1_SC85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], # Not yet in L1 menu ['j260_a10_lcw_sub_L1SC85', 'L1_SC85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j300_a10_lcw_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j300_a10_lcw_subjes_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], # Not yet in L1 menu ['j300_a10_lcw_L1SC85', 'L1_SC85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j260_a10r_L1J75', 'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], @@ -436,13 +436,13 @@ def setupMenu(): ['j85_L1RD0_FILLED', 'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j85_jes', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j360_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j380_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j400_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j420_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j440_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j460_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j480_a10_lcw_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j360_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j380_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j400_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j420_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j440_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j460_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j480_a10_lcw_subjes_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j400_a10r_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j420_a10r_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j440_a10r_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], @@ -533,11 +533,11 @@ def setupMenu(): ### ATR-14353: L1Topo jet chains: - ['j360_a10_lcw_L1HT150-J20.ETA31', 'L1_HT150-J20.ETA31', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j360_a10_lcw_L1HT150-J20s5.ETA31', 'L1_HT150-J20s5.ETA31', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j360_a10_lcw_subjes_L1HT150-J20.ETA31', 'L1_HT150-J20.ETA31', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j360_a10_lcw_subjes_L1HT150-J20s5.ETA31', 'L1_HT150-J20s5.ETA31', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ['j360_lcw_L1HT150-JJ15.ETA49', 'L1_HT150-JJ15.ETA49', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j460_a10_lcw_L1HT190-J15s5.ETA21', 'L1_HT190-J15s5.ETA21', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], - ['j460_a10_lcw_L1HT190-J15.ETA21', 'L1_HT190-J15.ETA21', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j460_a10_lcw_subjes_L1HT190-J15s5.ETA21', 'L1_HT190-J15s5.ETA21', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], + ['j460_a10_lcw_subjes_L1HT190-J15.ETA21', 'L1_HT190-J15.ETA21', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], ### ATR-14356: L1Topo VBF chians diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py index 08028aa5cdfbca97f3f38f05ea267cc881ef5434..2d1c8d115ed2139af8081765cd29c229b2eaa0e3 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py @@ -132,6 +132,8 @@ JetChainParts = { 'bMatching' : ['antimatchdr05mu'], 'dataScouting' : ['ds1', 'ds2'], } + + # ---- Jet Dictinary of default Values ---- JetChainParts_Default = { 'signature' : ['Jet'], @@ -145,7 +147,7 @@ JetChainParts_Default = { 'recoAlg' :'a4', 'dataType' :'tc', 'calib' :'em', - 'jetCalib' :'subjes', + 'jetCalib' :'subjesIS', 'scan' :'FS', 'addInfo' : [], 'TLA' : '', @@ -156,6 +158,10 @@ JetChainParts_Default = { 'bMatching' : [], 'dataScouting' : '', } +from TriggerJobOpts.TriggerFlags import TriggerFlags + +if "v6" in TriggerFlags.triggerMenuSetup(): + JetChainParts_Default.update({'jetCalib' :'subjes',}) #========================================================== # HT chains @@ -788,7 +794,7 @@ BeamspotChainParts = { # 'addInfo' : ['trkFS','idperf'], 'addInfo' : ['trkFS', 'allTE', 'activeTE','idperf'], 'hypo' : [], - 'l2IDAlg' : ['L2StarB','trkfast','FTK'], + 'l2IDAlg' : ['L2StarB','trkfast','FTK','FTKRefit'], 'threshold' : '', 'multiplicity' : '', 'trigType' : 'beamspot', diff --git a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py index b005e1b40d8ec1afd8e69c80ffaf79052079212a..73da2291c736e9035a904c901e8c482dc54277de 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py @@ -218,8 +218,12 @@ class L2EFChain_met(L2EFChainDef): #---------------------------------------------------- # Obtaining the needed jet TEs from the jet code #---------------------------------------------------- - chain = ['j0_lcw', '', [], ["Main"], ['RATE:SingleJet', 'BW:Jet'], -1] - + from TriggerJobOpts.TriggerFlags import TriggerFlags + if "v6" in TriggerFlags.triggerMenuSetup() or "v5" in TriggerFlags.triggerMenuSetup(): + chain = ['j0_lcw', '', [], ["Main"], ['RATE:SingleJet', 'BW:Jet'], -1] + else: + chain = ['j0', '', [], ["Main"], ['RATE:SingleJet', 'BW:Jet'], -1] + theDictFromChainName = DictFromChainName.DictFromChainName() jetChainDict = theDictFromChainName.getChainDict(chain)