Skip to content

WIP: Pseudomerge TrigHLTJetRec from 21.1 to master -- for discussion

Update packages:TrigHLTJetRec from upstream/21.1 to upstream/master via pseudo-merge

Firstly, noting that we hope not to reuse ~any of this code, and plan instead to depend wholly on the offline jet reconstruction infrastructure. It has been adapted so far for validation purposes.

This is a challenging one, because master has a lot of changes to support AthenaMT operation, plus a lot of commented code that in some cases clarifies but in others obscures the situation... Meanwhile, a number of new features were only successfully implemented in 21.1 (notably, SK and FTK). I'm doubtful that I got this right, but wanted to take a first stab at it to see how extensive the conflicts would be. The C++ changes are probably more correct than the python ones, but it's not impossible that I eliminated something by accident.

Anyway this is here more for discussion now. We might actually want to work through the conflicts collectively, but for now could @peter, @cantel, @jroloff please take a look and see if I obviously messed up anything?

Tagging @ckaldero for info. Adding Steven as well, as he was involved with a couple of things.

Edited by Teng Jian Khoo

Merge request reports