Add and modify egamma triggers for ATR-21242
Adding and modifying egamma triggers for ATR-21242, including changing L1_EM24VHI to L1_EM22VHI everywhere in TriggerMenuMT LS2_v1. L1_(2)EM15VHI is desired but not in L1 menus, so using L1_(2)EM15VH for now.
Merge request reports
Activity
added Trigger TriggerMenu master review-pending-level-1 labels
CI Result SUCCESS (hash 2f2778cd)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 13550]added review-approved label and removed review-pending-level-1 label
added review-user-action-required label and removed review-approved label
added 141 commits
-
2f2778cd...46198016 - 139 commits from branch
atlas:master
- 442614db - resolve by accepting theirs, will replace after re-running ART tests to generate new one
- 51f0e28f - attempt at a manual merge since tests were failing locally
-
2f2778cd...46198016 - 139 commits from branch
added review-pending-level-1 label and removed review-user-action-required label
I think this commit should fix it, but not entirely sure as local tests were failing for seemingly unrelated reasons. I don't have time to debug them at the moment so I'll wait and see what the CI reports, fingers crossed it is just some local misconfiguration and all is fine with this MR
Edited by Will Kalderon CI Result FAILURE (hash 51f0e28f)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 8, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 13600]Same build failures seen here, so I guess I wait until that is fixed: http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/GITWebArea/nightlies/master/2020-05-06T2138/Athena/x86_64-centos7-gcc8-opt/Athena/
Created ATLINFR-3529
!32540 (merged) is what broke this
added review-approved label and removed review-pending-level-1 label