diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 6402d64dbe24c3818cd68049d9ee72794dfbaea8..714022ce122d05153a2a3c8ccaa4b2d097a94ccc 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -16075,7 +16075,7 @@ HLT_j20_calratiovar_j70_j50a_j0_DJMASS900j50dphi260x200deta_roiftf_preselj20emf7 stepFeatures: 0: 4 1: 48 -HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27: +HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE40-jJ40: eventCount: 0 stepCounts: 0: 3 @@ -28347,8 +28347,8 @@ HLT_noalg_L1J75: eventCount: 9 HLT_noalg_L1J85: eventCount: 5 -HLT_noalg_L1LLPDPHI-jXE27-jJ27: - eventCount: 11 +HLT_noalg_L1LLPDPHI-jXE40-jJ40: + eventCount: 8 HLT_noalg_L1MU10BO: eventCount: 7 HLT_noalg_L1MU10BOM: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index de412ccbe41f94cccba33d1d985868e88d840a99..ce924b94ac8476c767cccb011449064728ecf80a 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -6323,7 +6323,7 @@ HLT_j20_calratiovar_j70_j50a_j0_DJMASS900j50dphi260x200deta_roiftf_preselj20emf4 eventCount: 0 HLT_j20_calratiovar_j70_j50a_j0_DJMASS900j50dphi260x200deta_roiftf_preselj20emf72_L1MJJ-500-NFF: eventCount: 0 -HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27: +HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE40-jJ40: eventCount: 0 HLT_j20_pf_ftf_presel4j85_PhysicsTLA_L13J50: eventCount: 0 @@ -10129,8 +10129,8 @@ HLT_noalg_L1J75: eventCount: 0 HLT_noalg_L1J85: eventCount: 0 -HLT_noalg_L1LLPDPHI-jXE27-jJ27: - eventCount: 1 +HLT_noalg_L1LLPDPHI-jXE40-jJ40: + eventCount: 0 HLT_noalg_L1MU10BO: eventCount: 0 HLT_noalg_L1MU10BOM: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py index b4ca66dc1b8eb647c6e2f8a163c917b5e8dee534..7224bb2ffadf5a94240f37eb78c501aa44780c13 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py @@ -1484,7 +1484,7 @@ def setupMenu(menu_name): # ATR-28563 - ChainProp(name='HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup+Topo2Group), + ChainProp(name='HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE40-jJ40', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup+Topo2Group), ] @@ -3270,7 +3270,7 @@ def setupMenu(menu_name): ChainProp(name='HLT_noalg_L12MU5VF', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=['PS:NoBulkMCProd']+SupportGroup+MuonXStreamersGroup), # ATR-28563 - ChainProp(name='HLT_noalg_L1LLPDPHI-jXE27-jJ27', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=JetPhaseIStreamersGroup+SupportPhIGroup+Topo2Group), + ChainProp(name='HLT_noalg_L1LLPDPHI-jXE40-jJ40', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=JetPhaseIStreamersGroup+SupportPhIGroup+Topo2Group), ] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py index 576f4e02c9a9a42d0bcd7a407b58b7689aa63631..03e80199fc16d4dfe0904b8d461481e30db9df3e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py @@ -369,7 +369,7 @@ class ItemDef: MenuItem('L1_2MU14FCH_OVERLAY').setLogic( d.MU14FCH.x(2) & physcond).setTriggerType(TT.zerobs) - MenuItem('L1_LLPDPHI-jXE27-jJ27').setLogic( d.TOPO_0DPHI15_jXE27delay_jJ27s & physcond) + MenuItem('L1_LLPDPHI-jXE40-jJ40').setLogic( d.TOPO_0DPHI10_jXE40delay_jJ40s & physcond) # HI MenuItem('L1_MU3V_VTE10' ).setLogic( d.MU3V & Not(d.TE10) & physcond).setTriggerType(TT.muon) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py index 48964cc8778d40dcc0295aa47e3cad8f8d330e38..d11ab43f74a1f6744402d3a9841276d523a3453d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py @@ -160,7 +160,7 @@ class MonitorDef: "L1_2eEM10L_MU8F", "L1_MU3V_jJ40", # L1Topo (Topo2 always in) - "L1_LLPDPHI-jXE27-jJ27", + "L1_LLPDPHI-jXE40-jJ40", "L1_BPH-0DR3-eEM9jJ40_MU5VF", "L1_BPH-0M9-eEM9-eEM7_MU5VF", "L1_BPH-0DR3-eEM9jJ40_2MU3V", "L1_BPH-0M9-eEM9-eEM7", "L1_BPH-0M10-3MU3V", "L1_BPH-0M10-3MU3VF", "L1_JPSI-1M5-eEM9", "L1_JPSI-1M5-eEM15", diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py index 00c7b5b0a8998b14225cbe64d0b294ac95c01e00..151dfa2b5e0fd4b630a2a67be48675bdcafb284d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py @@ -1534,7 +1534,7 @@ class TopoAlgoDef: tm.registerTopoAlgo(alg) #LLPDPHI - ATR-28563 - toponame = "0DPHI15-jXE27delay-jJ27s" + toponame = "0DPHI10-jXE40delay-jJ40s" alg = AlgConf.DeltaPhiIncl2( name = toponame, inputs = ['jXEs', 'jJs'], outputs = [ toponame ]) alg.addgeneric('NumResultBits', 1) alg.addgeneric('Delay1', 1) @@ -1543,10 +1543,10 @@ class TopoAlgoDef: alg.addgeneric('InputWidth2', HW.jJetOutputWidthSort) alg.addgeneric('MaxTob1', 1) alg.addgeneric('MaxTob2', 6) - alg.addvariable('MinET1', 27*_et_conversion) - alg.addvariable('MinET2', 27*_et_conversion) + alg.addvariable('MinET1', 40*_et_conversion) + alg.addvariable('MinET2', 40*_et_conversion) alg.addvariable('MinDeltaPhi', 0*_phi_conversion) - alg.addvariable('MaxDeltaPhi', 15*_phi_conversion) + alg.addvariable('MaxDeltaPhi', 10*_phi_conversion) tm.registerTopoAlgo(alg) # DISAMB 3 lists with DR cut to 2nd and 3rd lists diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py index c158441b57f7080672f85cc082b28baf99aaa393..b56e19a2e543d67fe30c07f0fc9c2d26f4e4ac22 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py @@ -360,7 +360,7 @@ def defineMenu(): 'L1_AFP_A_AND_C_TOF_CEP-CjJ100','L1_AFP_A_AND_C_TOF_T0T1_CEP-CjJ100', #ATR-28563 - 'L1_LLPDPHI-jXE27-jJ27', + 'L1_LLPDPHI-jXE40-jJ40', ] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py index 84bb2f3c051f462470457a07de6c9b90523aa764..d09097b99946ccbcbd46c7da479de789c0ce17cb 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py @@ -341,7 +341,7 @@ def defineInputsMenu(): '400INVM-0DPHI24-AjJ60s6-AjJ50s6', '400INVM-0DPHI22-AjJ60s6-AjJ50s6', '400INVM-0DPHI20-AjJ60s6-AjJ50s6'] ), - TopoMenuDef( '0DPHI15-jXE27delay-jJ27s', outputbits = 12), + TopoMenuDef( '0DPHI10-jXE40delay-jJ40s', outputbits = 12), ] } ]