Adding ALLPV{X,Y,Z} functors
This MR is adding three separate functors F.ALLPVX(pvs), F.ALLPVY(pvs), F.ALLPVZ(pvs) for the vertex positions of all PVs in the event.
This branch is based on !2745 (closed)
and requires Analysis!866 (merged) (as it adds support for tupling std::vector<SIMDWrapper::scalar::float_v> types).
Examples for the functors in DaVinci are added here: DaVinci!659 (closed)
FYI: @amathad
Merge request reports
Activity
mentioned in merge request DaVinci!659 (closed)
added RTA label
removed RTA label
added Functors label
added RTA label
mentioned in issue Moore#390 (closed)
added 1 commit
- 12c699db - removing duplicates from Composite.h and hardcoding of vertices data type
added 1 commit
- 445e143b - removing data type hardcoding from other components
mentioned in merge request !2745 (closed)
- [2022-02-23 19:08] Automatic merge failed in [lhcb-master-mr#3782](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-master-mr/3782/Rec/checkout
- [2022-04-20 14:14] Validation started with lhcb-master-mr#4261
Edited by Software for LHCbmentioned in issue Moore#397 (closed)
assigned to @lcalefic
mentioned in issue Moore#411 (closed)
mentioned in issue Moore#416 (closed)
Resolved by Lukas CaleficeThank you for this MR Lukas !
I tried to use your updates to run Funtuple, and it seems that we need
#include "Functors/PrimaryVertices.h"inPhys/FunctorCore/include/Functors/JIT_includes.h, otherwise FunTuple cannot findPrimaryVerticesinFunctors.- Last reply by Lukas Calefice
mentioned in issue Moore#421 (closed)
added 345 commits
-
bc7a9035...62c37b3d - 332 commits from branch
master - 52eeabcd - adding functors for X,Y,Z positions of BPV
- 4ba650c2 - Fixed formatting
- b0a8a5fe - move BPV XYZ functors to PrimaryVertices.h and update naming
- d5658431 - Fixed formatting
- f83294c8 - adding functor for z position of all PVs
- b47af08f - Fixed formatting
- 6aa3bcf1 - adding x and y components for ALLPV functors
- cffb9f49 - Fixed formatting
- 4acc03de - removing duplicates from Composite.h and hardcoding of vertices data type
- ca59a9fb - Fixed formatting
- 71dc87c9 - removing data type hardcoding from other components
- 2e5567a2 - Fixed formatting
- a65a352c - adding PrimaryVertices.h to JIT_includes.h
Toggle commit list-
bc7a9035...62c37b3d - 332 commits from branch
-
/ci-test !2748 (closed) DaVinci!659 (closed)
Started integration test build. Once done, check the results or the comparison to a reference build.
-
yes I did, the failing tests for DaVinci should be fixed (I was missing a variable in the qmt test). For Rec there is failing tests because I didn't implement tests for the functors. Last time I tried I didn't manage to do it properly which is why this MR was laying around for quite some time. Maybe someone can help with that if it is really needed. For the other projects I don't know what is happening.
check if the new doc at Moore!1431 (diffs) helps, otherwise ask @poluekt
@lcalefic you can add the BPV{X,Y,Z} functors here for example and also add a new boost test case here. The latter will be checked by this meta test. Minimum is to instantiate the functors you added (so that they are compiled). If you have a bit more time and fun, you could add some code that actually tests the desired behaviour.
added ci-test-triggered label
52 return ( endVertexPos( Sel::getBestPV( particle, vertices ) ) ).Y(); 53 } 54 }; 55 /** BestPrimaryVertexZ */ 56 struct BestPrimaryVertexZ : public Function { 57 /** This allows some error messages to be customised. It is not critical. */ 58 static constexpr auto name() { return "BestPrimaryVertexZ"; } 59 60 template <typename VContainer, typename Particle> 61 auto operator()( VContainer const& vertices, Particle const& particle ) const { 62 using Sel::Utils::endVertexPos; 63 return ( endVertexPos( Sel::getBestPV( particle, vertices ) ) ).Z(); 64 } 65 }; 66 /** AllPrimaryVerticesX */ 67 struct AllPrimaryVerticesX : public Function { -
these functors do not need a particle, right? maybe they should be more like https://gitlab.cern.ch/lhcb/Rec/-/blob/master/Phys/FunctorCore/include/Functors/TES.h#L64 per event
25 26 /** @namespace Functors::PrimaryVertices 27 * 28 * Functors that make sense for primary vertices. 29 */ 30 namespace Functors::detail { 31 32 /** BestPrimaryVertexX */ 33 struct BestPrimaryVertexX : public Function { 34 /** This allows some error messages to be customised. It is not critical. */ 35 static constexpr auto name() { return "BestPrimaryVertexX"; } 36 37 template <typename VContainer, typename Particle> 38 auto operator()( VContainer const& vertices, Particle const& particle ) const { 39 using Sel::Utils::endVertexPos; 40 return ( endVertexPos( Sel::getBestPV( particle, vertices ) ) ).X(); mentioned in merge request !2683 (merged)
mentioned in merge request !2867 (closed)
added 44 commits
-
a65a352c...e6ff4576 - 31 commits from branch
master - 534a36a3 - adding functors for X,Y,Z positions of BPV
- 8e94c116 - Fixed formatting
- 60b4742b - move BPV XYZ functors to PrimaryVertices.h and update naming
- 3a5b77d2 - Fixed formatting
- 2f0d6aab - adding functor for z position of all PVs
- 0b1e5d16 - Fixed formatting
- 54bf3ff9 - adding x and y components for ALLPV functors
- bccd9494 - Fixed formatting
- 20ccfd21 - removing duplicates from Composite.h and hardcoding of vertices data type
- 2c6ab2f8 - Fixed formatting
- 350fd4b2 - removing data type hardcoding from other components
- 674239d1 - Fixed formatting
- f5224d20 - adding PrimaryVertices.h to JIT_includes.h
Toggle commit list-
a65a352c...e6ff4576 - 31 commits from branch
-
closing because this MR will be superseded by !2683 (merged)
unassigned @lcalefic
