ATR-19309 HH->4b FTK Triggers

ATR-19309 - HH->4b FTK Triggers; added new L1 and new HLT, combined them, added FTKRefit version as well

This compiles, but I am waiting to see which additional tests I should run.

@jmontejo can you take a look and tell me if it is fine to leave L1 as V1-V4, so I don't run into 100 characters problem

Hi @lidiaz, all fine, the important part is that it fits :)

unmarked as a Work In Progress

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenu

added 21.3 Trigger TriggerMenu review-pending-level-1 labels

marked as a Work In Progress

Crashing on different issue.

unmarked as a Work In Progress

Now test passed, it is good to go.

Lidija

CI Result SUCCESS

	Athena
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20859-2019-02-03-23-40
Athena: number of compilation errors 0, warnings 166
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33233]

added review-approved label and removed review-pending-level-1 label

added review-user-action-required label

Hi @lidiaz,

Sorry, but there are conflicts in this one now. Could you take a look please?

Cheers,

John

Hi @jchapman,

how can I see conflict?

Lidija

git checkout TM_ATR-19309
git fetch --all --prune
git rebase upstream/21.3

Then you can fix the conflicts and finish the rebase. Then push the fixed branch back to your remote with git push -f

I still don't know what is the merge conflict. Commands above just undid all my changes (and took me few hours to get to that point). How do I see merge conflicts? And now I am stuck at this "rebase" (* (no branch, rebasing TM_ATR-19309)), can't go to my branch.

Lidija

To cancel the rebase use: git rebase --abort

I had a look. There is only one line of conflict after rebasing. In Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py around line 435.

        ['j0_gsc0_boffperf_split_FTKRefit_L1RD0_FILLED', 'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleBJet', 'BW:BJet'], -1],

This line is in 21.3, but not in your branch.

Here is a complete set of commands to fix the conflict:

git checkout TM_ATR-19309
git fetch --all --prune
git rebase upstream/21.3
git status
emacs -nw Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py
git add Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py
git rebase --continue
git push -f

I assume the fix is just to add this line.

Thanks. I found it once I tried to compile and there was "HEAD" in the file. The problem is that "rebase" undone all my changes in this file, and in all other files I touched, so these instructions are not doing what they were supposed to do. I am now tracking all these, basically, doing the whole thing once over again.

Lidija

Hmm, it worked fine for me locally. Are you using a sparse checkout?