Skip to content
Snippets Groups Projects
Commit b1fd16b6 authored by Sebastien Ponce's avatar Sebastien Ponce
Browse files

Merge branch 'cleanup-adl' into 'master'

Prefer namespace LHCb::Event over Sel::Utils for finding ADL-fallback accessors

See merge request lhcb/Rec!3285
parents c19427b8 5bc52115
No related branches found
No related tags found
No related merge requests found
......@@ -468,7 +468,7 @@ namespace Functors::Track {
struct ClosestToBeamState : public Function {
template <typename Data>
auto operator()( Data const& track ) const {
using Sel::Utils::trackState;
using LHCb::Event::trackState;
return trackState( track );
}
};
......
......@@ -186,7 +186,7 @@ namespace Sel {
template <typename Particle>
static auto getClosestToBeamState( Particle const& p ) {
if constexpr ( Sel::Utils::canBeExtrapolatedDownstream_v<Particle> ) {
using Sel::Utils::trackState;
using LHCb::Event::trackState;
return trackState( p );
} else {
// Make a state vector from a particle (position + 4-momentum)
......
......@@ -16,7 +16,7 @@ namespace Sel {
template <typename Particle>
static auto getClosestToBeamState( Particle const& p ) {
if constexpr ( Sel::Utils::canBeExtrapolatedDownstream_v<Particle> ) {
using Sel::Utils::trackState;
using LHCb::Event::trackState;
return trackState( p );
} else {
// Make a state vector from a particle (position + 4-momentum)
......@@ -73,15 +73,14 @@ namespace Sel {
*/
template <typename particle_t>
auto stateVectorFromComposite( particle_t const& p ) {
using Utils::posCovMatrix;
using Utils::referencePoint;
using Utils::threeMomCovMatrix;
using Utils::threeMomentum;
using Utils::threeMomPosCovMatrix;
auto const pos = referencePoint( p );
auto const mom = threeMomentum( p );
using LHCb::Event::posCovMatrix;
using LHCb::Event::referencePoint;
using LHCb::Event::threeMomCovMatrix;
using LHCb::Event::threeMomentum;
using LHCb::Event::threeMomPosCovMatrix;
auto const pos = referencePoint( p );
auto const mom = threeMomentum( p );
auto const momCov = threeMomCovMatrix( p );
auto const posCov = posCovMatrix( p );
auto const momPosCov = threeMomPosCovMatrix( p );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment