Changes on TDR branch that can be merged back to master

The current head of TDR branch is fully compatible with master (just some new options that are not used in master). Merging, and will reopen another (empty) MR for TDR branch

added 23 commits

• 64f0740b...a36fe2db - 15 commits from branch master
• 94bf9b9d - Allow usage of HTL1Fitter in MiniBrunel configuration
• 30fbbdf2 - adding a TEMPORARY hack for the tdr to allow the use of a GEC cut in Hive mode
• 10539c7f - Added a way to set the IP cut in MiniBrunel
• bcbef3fb - Added way to trigger the trigger mode in PrPixelTracking for MiniBrunel
• aab27b49 - Enable usaged of HLTEventLoopMgr in MiniBrunel
• 5df56434 - Fixed typo in MiniBrunel config file
• 14f9b518 - Readded lost handling of EventSlots
• 4fc9f8b8 - Readded lost setting for ThreadPoolSize in MiniBrunel config file

Compare with previous version

Rebased on lastest master

• [2017-12-20 00:17] Validation started with lhcb-tdr-test#1
• [2017-12-21 00:13] Validation started with lhcb-tdr-test#2
• [2017-12-22 00:15] Validation started with lhcb-tdr-test#3
• [2017-12-22 11:13] Validation started with lhcb-tdr-test#4
• [2017-12-23 00:16] Validation started with lhcb-tdr-test#5
• [2017-12-24 00:13] Validation started with lhcb-tdr-test#6
• [2017-12-25 00:13] Validation started with lhcb-tdr-test#7
• [2017-12-26 00:13] Validation started with lhcb-tdr-test#8
• [2017-12-27 00:12] Validation started with lhcb-tdr-test#9
• [2017-12-28 00:16] Validation started with lhcb-tdr-test#10
• [2017-12-29 00:12] Validation started with lhcb-tdr-test#11
• [2017-12-30 00:13] Validation started with lhcb-tdr-test#12
• [2017-12-31 00:11] Validation started with lhcb-tdr-test#13
• [2018-01-02 00:12] Validation started with lhcb-tdr-test#14
• [2018-01-03 00:11] Validation started with lhcb-tdr-test#15
• [2018-01-04 00:13] Validation started with lhcb-tdr-test#16
• [2018-01-05 00:12] Validation started with lhcb-tdr-test#17
• [2018-01-06 00:14] Validation started with lhcb-tdr-test#18
• [2018-01-07 00:12] Validation started with lhcb-tdr-test#19
• [2018-01-08 00:12] Validation started with lhcb-tdr-test#20
• [2018-01-09 00:14] Validation started with lhcb-tdr-test#21
• [2018-01-10 00:18] Validation started with lhcb-tdr-test#22
• [2018-01-11 00:15] Validation started with lhcb-tdr-test#23
• [2018-01-12 00:12] Validation started with lhcb-tdr-test#24
• [2018-01-13 00:16] Validation started with lhcb-tdr-test#25
• [2018-01-14 00:15] Validation started with lhcb-tdr-test#26
• [2018-01-15 00:13] Validation started with lhcb-tdr-test#27
• [2018-01-16 00:15] Validation started with lhcb-tdr-test#28
• [2018-01-17 00:16] Validation started with lhcb-tdr-test#29
• [2018-01-18 00:15] Validation started with lhcb-tdr-test#30
• [2018-01-19 00:17] Validation started with lhcb-tdr-test#31
• [2018-01-20 00:16] Validation started with lhcb-tdr-test#32
• [2018-01-20 00:52] Validation started with lhcb-tdr-test#32
• [2018-01-20 01:43] Validation started with lhcb-tdr-test#32
• [2018-01-20 10:22] Validation started with lhcb-tdr-test#32
• [2018-01-21 00:18] Automatic merge failed in lhcb-tdr-test#33
• [2018-01-22 00:18] Validation started with lhcb-tdr-test#34
• [2018-01-23 00:16] Validation started with lhcb-tdr-test#35
• [2018-01-24 00:14] Validation started with lhcb-tdr-test#36
• [2018-01-25 00:16] Validation started with lhcb-tdr-test#37
• [2018-01-26 00:17] Validation started with lhcb-tdr-test#38
• [2018-01-27 00:16] Validation started with lhcb-tdr-test#39
• [2018-01-28 00:14] Validation started with lhcb-tdr-test#40
• [2018-01-29 00:13] Validation started with lhcb-tdr-test#41
• [2018-01-30 00:18] Validation started with lhcb-tdr-test#42
• [2018-01-30 01:57] Validation started with lhcb-tdr-test#42
• [2018-01-31 00:15] Validation started with lhcb-tdr-test#43
• [2018-02-01 00:19] Validation started with lhcb-tdr-test#44
• [2018-02-01 11:46] Validation started with lhcb-tdr-test#45
• [2018-02-02 00:18] Validation started with lhcb-tdr-test#46
• [2018-02-03 00:16] Validation started with lhcb-tdr-test#47
• [2018-02-04 00:18] Validation started with lhcb-tdr-test#48
• [2018-02-05 00:19] Validation started with lhcb-tdr-test#49
• [2018-02-05 09:50] Validation started with lhcb-tdr-test#50
• [2018-02-06 00:15] Validation started with lhcb-tdr-test#51
• [2018-02-07 00:14] Validation started with lhcb-tdr-test#52
• [2018-02-08 00:18] Validation started with lhcb-tdr-test#53
• [2018-02-09 00:20] Validation started with lhcb-tdr-test#54
• [2018-02-10 00:16] Validation started with lhcb-tdr-test#55
• [2018-02-11 00:14] Validation started with lhcb-tdr-test#56
• [2018-02-12 00:16] Validation started with lhcb-tdr-test#57
• [2018-02-13 00:18] Validation started with lhcb-tdr-test#58
• [2018-02-14 00:24] Validation started with lhcb-tdr-test#59
• [2018-02-15 00:16] Validation started with lhcb-tdr-test#60
• [2018-02-16 00:14] Validation started with lhcb-tdr-test#61
• [2018-02-17 00:15] Validation started with lhcb-tdr-test#62
• [2018-02-17 00:23] Validation started with lhcb-gaudi-head#1771
• [2018-02-18 00:17] Validation started with lhcb-tdr-test#63
• [2018-02-18 00:19] Validation started with lhcb-gaudi-head#1772
• [2018-02-18 00:54] Validation started with lhcb-tdr-test#63
• [2018-02-18 01:12] Validation started with lhcb-gaudi-head#1772
• [2018-02-18 01:34] Validation started with lhcb-tdr-test#63
• [2018-02-18 01:55] Validation started with lhcb-gaudi-head#1772

added 15 commits

• 4fc9f8b8...2db18ab4 - 7 commits from branch master
• 759736cb - Allow usage of HTL1Fitter in MiniBrunel configuration
• ea7e0ed0 - adding a TEMPORARY hack for the tdr to allow the use of a GEC cut in Hive mode
• c1071b5a - Added a way to set the IP cut in MiniBrunel
• 2eca6571 - Added way to trigger the trigger mode in PrPixelTracking for MiniBrunel
• 42766ae3 - Enable usaged of HLTEventLoopMgr in MiniBrunel
• d3029577 - Fixed typo in MiniBrunel config file
• dac172e4 - Readded lost handling of EventSlots
• 0ced8c70 - Readded lost setting for ThreadPoolSize in MiniBrunel config file

Compare with previous version

@sponce FYI I have rebased this on current master to update the test reference files, in particular to follow some changes to names of Rich algorithms that would otherwise have broken all the tests. For the record (as I don't often rebase...) this is what I did:

-bash-4.1$ git checkout TDR
Branch TDR set up to track remote branch TDR from origin.
Switched to a new branch 'TDR'
-bash-4.1$ git rebase origin/master
First, rewinding head to replay your work on top of it...
Applying: Allow usage of HTL1Fitter in MiniBrunel configuration
Applying: adding a TEMPORARY hack for the tdr to allow the use of a GEC cut in Hive mode
Applying: Added a way to set the IP cut in MiniBrunel
Applying: Added way to trigger the trigger mode in PrPixelTracking for MiniBrunel
Applying: Enable usaged of HLTEventLoopMgr in MiniBrunel
Applying: Fixed typo in MiniBrunel config file
Applying: Readded lost handling of EventSlots
Applying: Readded lost setting for ThreadPoolSize in MiniBrunel config file
-bash-4.1$ git status
On branch TDR
Your branch and 'origin/TDR' have diverged,
and have 15 and 8 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean
-bash-4.1$ git push -f origin
Counting objects: 56, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (34/34), done.
Writing objects: 100% (56/56), 5.26 KiB | 2.63 MiB/s, done.
Total 56 (delta 32), reused 22 (delta 14)
remote: 
remote: View merge request for TDR:
remote:   https://gitlab.cern.ch/lhcb/Brunel/merge_requests/334
remote: 
To ssh://gitlab.cern.ch:7999/lhcb/Brunel.git
 + 4fc9f8b8...0ced8c70 TDR -> TDR (forced update)

@sponce Following merge of !346 (merged), this should be rebased on current master to fix the merge conflict.

Well. it was already rebased on !346 (merged) so there should not have been any conflict. They only come from the fact that you rebased again on master in the meantime, de facto undoing the rebase on !346 (merged). Anyway, I'll rebase all TDR branches on master again, so that we restart cleanly after all the merges of today.

The only rebase I did of Brunel was a month ago!

So tomorrow I should accept the few outstanding MRs to master before you rebase

Oh, I'm already compiling the result of the rebase and will push tonight. I'll rebase again after the remaining merges of tomorrow. Small rebases make things easy as you have only trivial conflicts. That's the advantages of rebasing all the time over merges.

added 21 commits

• 0ced8c70...f79ad7e1 - 15 commits from branch master
• 750ff552 - Allow usage of HTL1Fitter in MiniBrunel configuration
• ec0cec39 - adding a TEMPORARY hack for the tdr to allow the use of a GEC cut in Hive mode
• a5907de8 - Added a way to set the IP cut in MiniBrunel
• 980f87ad - Added way to trigger the trigger mode in PrPixelTracking for MiniBrunel
• 4cdc8089 - Readded lost handling of EventSlots
• 0225b907 - Readded lost setting for ThreadPoolSize in MiniBrunel config file

Compare with previous version

Rebased on top of master. The conflict with !346 (merged) is thus solved.

added 16 commits

• 0225b907...48f72681 - 9 commits from branch master
• eec711a8 - Allow usage of HTL1Fitter in MiniBrunel configuration
• 9745a4dc - adding a TEMPORARY hack for the tdr to allow the use of a GEC cut in Hive mode
• 28ace824 - Added a way to set the IP cut in MiniBrunel
• b12d515d - Added way to trigger the trigger mode in PrPixelTracking for MiniBrunel
• 2080bc2d - Readded lost handling of EventSlots
• afdabbee - Readded lost setting for ThreadPoolSize in MiniBrunel config file
• fff434d9 - add veloonly configuration in MiniBrunel

Compare with previous version

Rebased again on top of master and integrated (via cherry-picking, after cleaning and squashing) the content of branch TDR_VeloOnlyConfiguration

mentioned in merge request !344 (closed)

And worked around problem introduced in TrackAddLikelihood about constness. It should now compile again.

added 31 commits

• fff434d9...a94cdea3 - 23 commits from branch master
• 9dc89d7c - Allow usage of HTL1Fitter in MiniBrunel configuration
• 0e39e568 - adding a TEMPORARY hack for the tdr to allow the use of a GEC cut in Hive mode
• 77dd9130 - Added a way to set the IP cut in MiniBrunel
• 6f7770f8 - Added way to trigger the trigger mode in PrPixelTracking for MiniBrunel
• a9586c9b - Readded lost handling of EventSlots
• aee45b16 - Readded lost setting for ThreadPoolSize in MiniBrunel config file
• 462574e4 - add veloonly configuration in MiniBrunel
• 4d0d20d6 - Add option for ParameterizedKalman

Compare with previous version

rebased on latest master, and merged in !358 (closed) which adds options for parametrized Kalman to MiniBrunel configuration

mentioned in merge request !358 (closed)

added 1 commit

• 8bf1cbb1 - Added an easy way to run Pr checks in MiniBrunel

Compare with previous version

Looking at this MR, I don't see anything that would break in master branch. I wonder if I shouldn't try to merge this (using lhcb-gaudi-head label to start with) and then just keep the branch empty?

Trying the lhcb-gaudi-head label tonight

unmarked as a Work In Progress

changed title from WIP: TDR code, aka code that would break master but is needed to run TDR tests to Changes on TDR branch that can be merged back to master

changed the description

resolved all discussions

mentioned in issue #1 (closed)

merged

mentioned in commit 62864727