"SOA Particle" + combiner and filter to use it with
depends on LHCb!2309 (merged) and Rec!1728 (merged)
DISCLAIMER: this does not aim to provide anything feature complete, rather the opposite. its super incomplete.
this supersedes !603 (closed) by modernizing the combiner introduced there.
other than that, i introduce some stuff that could at some point end up as variant alternative in v2::Particle
for now, all of the things related to the model are stored in Particle_v2.h
, although we will want to change that later (as it grows).
the ChargedBasics
are currently a zip of many smaller things like MuonPIDs
, RichPIDs
, ParticleIDs
and (for now) Fitted::Forward::Tracks
(we probably want to change that at some point)
to fill the ChargedBasics
, i currently run something that converts LHCb::ProtoParticle
s to ChargedBasics
(Particle_to_Particle_v2.h) (the protos come from file in the hlt2_example in moore)
the ThOrParticleCombiner
currently supports 2,3,4 body combination, and the only possible signature right now is [ChargedBasics] -> Composites
(also residing in Particle_v2.h). there are many open todos, like supporting combination of composites, vertex fitting with something other than the Closest To Beam state, vectorizing the combination cut and so on. a (incomplete) list of todos is listed in the combiner file, together with //TODO
s here and there
there are significant speedups to be gained, the ones i saw during development ranged from 2x to 10x (do not hold me accountable or quote me for these numbers in the end), even with a fast vertexfitter (ParticleVertexFitter
) and distancecalculator TrgDistanceCalculator
activated.
you may ask: why merge this if its so highly incomplete? because this MR is already huge and incremental steps seem better for synchronization with others and to try to keep an overview. and rebasing is a PITA
thx to @olupton for the help with debugging :)
Merge request reports
Activity
assigned to @mstahl
A lot to digest, and several TODOs in the description and the code. So I'm not trying to cause additional PITA, but please add testing and documentation to this TODO list :)
/ci-test --merge LHCb!2309 (merged) Rec!1728 (merged)
Started reference and integration test builds. Once done, check the comparison of build and test results.
- [2020-01-13 12:44] Validation started with lhcb-master-mr#342
Edited by Software for LHCbSome builds are failing. @nnolte could you please have a look at https://lhcb-nightlies.web.cern.ch/logs/build/nightly/lhcb-master-mr/342/x86_64-centos7-clang8-opt/LHCb/ and https://lhcb-nightlies.web.cern.ch/logs/build/nightly/lhcb-master-mr/342/x86_64-centos7-gcc9-opt/Phys/ in particular?
Thanks! Let's test again
/ci-test --merge LHCb!2309 (merged) Rec!1728 (merged)
Started reference and integration test builds. Once done, check the comparison of build and test results.
- [2020-01-14 13:59] Validation started with lhcb-master-mr#349
Edited by Software for LHCbYesterdays Phys builds are still red. @nnolte Can you have another look? https://lhcb-nightlies.web.cern.ch/logs/build/nightly/lhcb-master-mr/349/x86_64-centos7-gcc9-opt/Phys/
ill iterate myself until this works out :D
/ci-test --merge LHCb!2309 (merged) Rec!1728 (merged)
Started reference and integration test builds. Once done, check the comparison of build and test results.
- [2020-01-15 12:56] Validation started with lhcb-master-mr#357
Edited by Software for LHCbok, so now it compiles locally with clang8-opt and gcc9-avx2 and gcc9-opt, lets see if ci-test agrees.
/ci-test --merge LHCb!2309 (merged) Rec!1728 (merged)
Edited by Niklas Stefan NolteStarted reference and integration test builds. Once done, check the comparison of build and test results.
- [2020-01-16 09:31] Validation started with lhcb-master-mr#360
Edited by Software for LHCbThe tests look good now! There are some warnings remaining in the debug and clang builds though https://lhcb-nightlies.web.cern.ch/logs/build/nightly/lhcb-master-mr/360/x86_64-centos7-clang8-opt/Phys/ and https://lhcb-nightlies.web.cern.ch/logs/build/nightly/lhcb-master-mr/360/x86_64-centos7-gcc9-dbg/Phys/
I assume this doesn't have an effect on throughputs, right? So we should be ready to go with all 3 MRs (would it make sense to do a test including Moore!361 (merged) ?) once the warnings are fixed
/ci-test --merge LHCb!2309 (merged) Rec!1728 (merged)
Started reference and integration test builds. Once done, check the comparison of build and test results.
- [2020-01-17 13:44] Validation started with lhcb-master-mr#366
- [2020-01-19 00:13] Validation started with lhcb-gaudi-head#2507
- [2020-01-20 00:09] Validation started with lhcb-gaudi-head#2508
- [2020-01-21 00:11] Validation started with lhcb-gaudi-head#2509
- [2020-01-22 00:13] Validation started with lhcb-gaudi-head#2510
- [2020-01-23 00:10] Validation started with lhcb-gaudi-head#2511
- [2020-01-23 10:04] Validation started with lhcb-gaudi-head#2512
- [2020-01-23 10:57] Validation started with lhcb-gaudi-head#2513
- [2020-01-23 15:47] Validation started with lhcb-gaudi-head#2513
- [2020-01-24 00:15] Validation started with lhcb-gaudi-head#2514
- [2020-01-25 00:09] Validation started with lhcb-gaudi-head#2515
- [2020-01-27 10:14] Validation started with lhcb-master-mr#394
- [2020-01-28 00:10] Validation started with lhcb-gaudi-head#2516
- [2020-01-29 00:10] Validation started with lhcb-gaudi-head#2517
- [2020-01-30 00:13] Validation started with lhcb-gaudi-head#2518
- [2020-01-31 00:09] Validation started with lhcb-gaudi-head#2519
- [2020-02-01 00:08] Validation started with lhcb-gaudi-head#2520
- [2020-02-02 00:07] Validation started with lhcb-gaudi-head#2521
- [2020-02-02 20:00] Validation started with lhcb-master-mr#429
- [2020-02-03 19:47] Validation started with lhcb-master-mr#434
- [2020-02-04 00:14] Validation started with lhcb-gaudi-head#2522
- [2020-02-05 00:10] Validation started with lhcb-gaudi-head#2523
- [2020-02-05 00:48] Validation started with lhcb-gaudi-head#2523
- [2020-02-05 09:56] Validation started with lhcb-master-mr#438
- [2020-02-06 00:08] Validation started with lhcb-gaudi-head#2524
- [2020-02-06 00:21] Validation started with lhcb-gaudi-head#2524
- [2020-02-06 00:40] Validation started with lhcb-gaudi-head#2524
- [2020-02-07 00:11] Validation started with lhcb-gaudi-head#2525
Edited by Software for LHCb
added Functors enhancement labels
added 1 commit
- 0f5a203e - add doc and testing to todo + move proto2chargedbasic
mentioned in merge request Moore!361 (merged)
added lhcb-gaudi-head label
mentioned in issue Moore#128 (closed)
mentioned in issue Moore#131 (closed)
added 56 commits
-
d1af570d...1932b25f - 2 commits from branch
master
- 5d4466c6 - security
- 4f639139 - 3 -> Three
- 0dde5b54 - particlecombiner
- a92fc9ef - stuffedy
- e864b393 - unique
- bfde4a77 - safety push
- 1465a3ca - save the game
- 4471ab9a - fixed copyright
- f34339d5 - change/reformat
- 44255cb1 - savepoint
- c53546b2 - daugther cuts and other stuff
- 340fd990 - finished 3/4body combiner
- f4672843 - format
- f50d9527 - twobody
- a814bb33 - fix daughter cuts
- fc6f54c8 - fix daughter cuts 4real
- 855d8c71 - .
- 46968a86 - remove particlecombination, buffer the counters (at a better place) and prepare
- f0396e14 - Fixed formatting
- 03cb8321 - doca and docacut
- 01297be9 - blub
- 55118548 - adopt to changes in rec
- b8b3c096 - no more predicate
- cedb4c15 - squashed
- 07facacf - fixups after rebase
- dcd1b40b - fixed one of my more stupid stupidities
- a1dbfbb4 - combdlls
- 849b0d95 - min -> lowest
- 5f9490d9 - started with particlecombiner, and fixed the avx2 filtering
- 2ea61876 - thorparticlecombiner, need to implement pairwise cuts, also removed mother...
- d78a5fee - omit functors that are of type "ALL"
- 9e939b0f - safety push, continue with vertex fit
- 1b204f01 - safety push, need to continue with vertex fit
- afe8313c - safety push, nearly done with vertex fit (hopefully?)
- 60de8fcd - yeaaah, some stuff
- 80be10e0 - add dumper
- 892c6fee - change the filter to prfilter
- 71b75721 - update shiny combiny to latest advantages
- 757563e2 - adjust legacy algs
- 27f4dfa5 - continue with thorparticlecombiner
- dfa231c8 - fix stuff
- 97776b18 - adding a converter
- de0a4c0b - omitting the vertexinsidefoil check for now
- c40e01d0 - remove the correlation thingies again
- b7188741 - remove the overlapcount
- 0b546684 - converters into an own file structure
- 50950d3e - remove children for now, since not yet used
- 5df6f1e5 - add format, copyright
- 0f18aa07 - formatting (again?)
- c31fd045 - add doc and testing to todo + move proto2chargedbasic
- 0aaab507 - ..
- 3c646987 - mah
- 38ec5fb6 - remove code that causes warnings
- 32c1e4ff - upsi
Toggle commit list-
d1af570d...1932b25f - 2 commits from branch
added Composites label