Skip to content

[math][genvector] add support for structured bindings in 2D/3D/4D #19956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

[math][genvector] add support for structured bindings in 2D/3D/4D #19956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c323f6b
[nfc] fix typo in docu
ferdymercury Sep 23, 2025
c55e652
[math] add structured bindings to displacement vectors 2D 3D and Lore…
ferdymercury Sep 23, 2025
06d98b4
[math] test structured bindings
ferdymercury Sep 23, 2025
3e09a83
[math] GenVectorX rm evil using namespace in headers
ferdymercury Sep 23, 2025
9372f85
[math] try namespace fix
ferdymercury Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hist/hist/inc/THistRange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class TBinIterator {

int fDim; ///< Histogram dimension

/// Compute global bin number given x,y,x bin numbers
/// Compute global bin number given x,y,z bin numbers
void SetGlobalBin()
{
if (fDim == 1)
Expand Down
62 changes: 31 additions & 31 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
conversion functions from 3D rotation.
*/

void convert(Rotation3D const &from, AxisAngle &to);

Check failure on line 54 in math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h

View workflow job for this annotation

GitHub Actions / fedora42 CMAKE_CXX_STANDARD=23 

unknown type name 'Rotation3D'

Check failure on line 54 in math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h

View workflow job for this annotation

GitHub Actions / ubuntu2404 CMAKE_BUILD_TYPE=Debug 

unknown type name 'AxisAngle'; did you mean '::ROOT::MathSYCL::AxisAngle'?

Check failure on line 54 in math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h

View workflow job for this annotation

GitHub Actions / ubuntu2404 CMAKE_BUILD_TYPE=Debug 

unknown type name 'Rotation3D'
void convert(Rotation3D const &from, EulerAngles &to);
void convert(Rotation3D const &from, Quaternion &to);
void convert(Rotation3D const &from, RotationZYX &to);
Expand All @@ -59,61 +59,61 @@
// ----------------------------------------------------------------------
// conversions from AxisAngle

void convert(AxisAngle const &from, Rotation3D &to);
void convert(AxisAngle const &from, EulerAngles &to);
void convert(AxisAngle const &from, Quaternion &to);
void convert(AxisAngle const &from, RotationZYX &to);
void convert(::ROOT::ROOT_MATH_ARCH::AxisAngle const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);

Check failure on line 62 in math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h

View workflow job for this annotation

GitHub Actions / ubuntu2404 CMAKE_BUILD_TYPE=Debug 

no type named 'Rotation3D' in namespace 'ROOT::MathSYCL'; did you mean simply 'Rotation3D'?

Check failure on line 62 in math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h

View workflow job for this annotation

GitHub Actions / ubuntu2404 CMAKE_BUILD_TYPE=Debug 

no type named 'AxisAngle' in namespace 'ROOT::MathSYCL'; did you mean simply 'AxisAngle'?
void convert(::ROOT::ROOT_MATH_ARCH::AxisAngle const &from, ::ROOT::ROOT_MATH_ARCH::EulerAngles &to);

Check failure on line 63 in math/experimental/genvectorx/inc/MathX/GenVectorX/3DConversions.h

View workflow job for this annotation

GitHub Actions / ubuntu2404 CMAKE_BUILD_TYPE=Debug 

no type named 'AxisAngle' in namespace 'ROOT::MathSYCL'; did you mean simply 'AxisAngle'?
void convert(::ROOT::ROOT_MATH_ARCH::AxisAngle const &from, ::ROOT::ROOT_MATH_ARCH::Quaternion &to);
void convert(::ROOT::ROOT_MATH_ARCH::AxisAngle const &from, ::ROOT::ROOT_MATH_ARCH::RotationZYX &to);

// ----------------------------------------------------------------------
// conversions from EulerAngles

void convert(EulerAngles const &from, Rotation3D &to);
void convert(EulerAngles const &from, AxisAngle &to);
void convert(EulerAngles const &from, Quaternion &to);
void convert(EulerAngles const &from, RotationZYX &to);
void convert(::ROOT::ROOT_MATH_ARCH::EulerAngles const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);
void convert(::ROOT::ROOT_MATH_ARCH::EulerAngles const &from, ::ROOT::ROOT_MATH_ARCH::AxisAngle &to);
void convert(::ROOT::ROOT_MATH_ARCH::EulerAngles const &from, ::ROOT::ROOT_MATH_ARCH::Quaternion &to);
void convert(::ROOT::ROOT_MATH_ARCH::EulerAngles const &from, ::ROOT::ROOT_MATH_ARCH::RotationZYX &to);

// ----------------------------------------------------------------------
// conversions from Quaternion

void convert(Quaternion const &from, Rotation3D &to);
void convert(Quaternion const &from, AxisAngle &to);
void convert(Quaternion const &from, EulerAngles &to);
void convert(Quaternion const &from, RotationZYX &to);
void convert(::ROOT::ROOT_MATH_ARCH::Quaternion const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);
void convert(::ROOT::ROOT_MATH_ARCH::Quaternion const &from, ::ROOT::ROOT_MATH_ARCH::AxisAngle &to);
void convert(::ROOT::ROOT_MATH_ARCH::Quaternion const &from, ::ROOT::ROOT_MATH_ARCH::EulerAngles &to);
void convert(::ROOT::ROOT_MATH_ARCH::Quaternion const &from, ::ROOT::ROOT_MATH_ARCH::RotationZYX &to);

// ----------------------------------------------------------------------
// conversions from RotationZYX

void convert(RotationZYX const &from, Rotation3D &to);
void convert(RotationZYX const &from, AxisAngle &to);
void convert(RotationZYX const &from, EulerAngles &to);
void convert(RotationZYX const &from, Quaternion &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZYX const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZYX const &from, ::ROOT::ROOT_MATH_ARCH::AxisAngle &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZYX const &from, ::ROOT::ROOT_MATH_ARCH::EulerAngles &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZYX const &from, ::ROOT::ROOT_MATH_ARCH::Quaternion &to);

// ----------------------------------------------------------------------
// conversions from RotationX

void convert(RotationX const &from, Rotation3D &to);
void convert(RotationX const &from, RotationZYX &to);
void convert(RotationX const &from, AxisAngle &to);
void convert(RotationX const &from, EulerAngles &to);
void convert(RotationX const &from, Quaternion &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationX const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationX const &from, ::ROOT::ROOT_MATH_ARCH::RotationZYX &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationX const &from, ::ROOT::ROOT_MATH_ARCH::AxisAngle &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationX const &from, ::ROOT::ROOT_MATH_ARCH::EulerAngles &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationX const &from, ::ROOT::ROOT_MATH_ARCH::Quaternion &to);

// ----------------------------------------------------------------------
// conversions from RotationY

void convert(RotationY const &from, Rotation3D &to);
void convert(RotationY const &from, RotationZYX &to);
void convert(RotationY const &from, AxisAngle &to);
void convert(RotationY const &from, EulerAngles &to);
void convert(RotationY const &from, Quaternion &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationY const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationY const &from, ::ROOT::ROOT_MATH_ARCH::RotationZYX &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationY const &from, ::ROOT::ROOT_MATH_ARCH::AxisAngle &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationY const &from, ::ROOT::ROOT_MATH_ARCH::EulerAngles &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationY const &from, ::ROOT::ROOT_MATH_ARCH::Quaternion &to);

// ----------------------------------------------------------------------
// conversions from RotationZ

void convert(RotationZ const &from, Rotation3D &to);
void convert(RotationZ const &from, RotationZYX &to);
void convert(RotationZ const &from, AxisAngle &to);
void convert(RotationZ const &from, EulerAngles &to);
void convert(RotationZ const &from, Quaternion &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZ const &from, ::ROOT::ROOT_MATH_ARCH::Rotation3D &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZ const &from, ::ROOT::ROOT_MATH_ARCH::RotationZYX &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZ const &from, ::ROOT::ROOT_MATH_ARCH::AxisAngle &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZ const &from, ::ROOT::ROOT_MATH_ARCH::EulerAngles &to);
void convert(::ROOT::ROOT_MATH_ARCH::RotationZ const &from, ::ROOT::ROOT_MATH_ARCH::Quaternion &to);

} // namespace gv_detail
} // namespace ROOT_MATH_ARCH
Expand Down
122 changes: 61 additions & 61 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/3DDistances.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,95 +49,95 @@ namespace gv_detail {
// ----------------------------------------------------------------------
// Distance from Rotation3D

double dist(Rotation3D const &r1, Rotation3D const &r2);
double dist(Rotation3D const &r1, AxisAngle const &r2);
double dist(Rotation3D const &r1, EulerAngles const &r2);
double dist(Rotation3D const &r1, Quaternion const &r2);
double dist(Rotation3D const &r1, RotationZYX const &r2);
double dist(Rotation3D const &r1, RotationX const &r2);
double dist(Rotation3D const &r1, RotationY const &r2);
double dist(Rotation3D const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZYX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Rotation3D const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from AxisAngle

double dist(AxisAngle const &r1, Rotation3D const &r2);
double dist(AxisAngle const &r1, AxisAngle const &r2);
double dist(AxisAngle const &r1, EulerAngles const &r2);
double dist(AxisAngle const &r1, Quaternion const &r2);
double dist(AxisAngle const &r1, RotationZYX const &r2);
double dist(AxisAngle const &r1, RotationX const &r2);
double dist(AxisAngle const &r1, RotationY const &r2);
double dist(AxisAngle const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZYX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::AxisAngle const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from EulerAngles

double dist(EulerAngles const &r1, Rotation3D const &r2);
double dist(EulerAngles const &r1, AxisAngle const &r2);
double dist(EulerAngles const &r1, EulerAngles const &r2);
double dist(EulerAngles const &r1, Quaternion const &r2);
double dist(EulerAngles const &r1, RotationZYX const &r2);
double dist(EulerAngles const &r1, RotationX const &r2);
double dist(EulerAngles const &r1, RotationY const &r2);
double dist(EulerAngles const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZYX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::EulerAngles const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from Quaternion

double dist(Quaternion const &r1, Rotation3D const &r2);
double dist(Quaternion const &r1, AxisAngle const &r2);
double dist(Quaternion const &r1, EulerAngles const &r2);
double dist(Quaternion const &r1, Quaternion const &r2);
double dist(Quaternion const &r1, RotationZYX const &r2);
double dist(Quaternion const &r1, RotationX const &r2);
double dist(Quaternion const &r1, RotationY const &r2);
double dist(Quaternion const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZYX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::Quaternion const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from RotationZYX

double dist(RotationZYX const &r1, Rotation3D const &r2);
double dist(RotationZYX const &r1, AxisAngle const &r2);
double dist(RotationZYX const &r1, EulerAngles const &r2);
double dist(RotationZYX const &r1, Quaternion const &r2);
double dist(RotationZYX const &r1, RotationZYX const &r2);
double dist(RotationZYX const &r1, RotationX const &r2);
double dist(RotationZYX const &r1, RotationY const &r2);
double dist(RotationZYX const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZYX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZYX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from RotationX

double dist(RotationX const &r1, Rotation3D const &r2);
double dist(RotationX const &r1, AxisAngle const &r2);
double dist(RotationX const &r1, EulerAngles const &r2);
double dist(RotationX const &r1, Quaternion const &r2);
double dist(RotationX const &r1, RotationX const &r2);
double dist(RotationX const &r1, RotationY const &r2);
double dist(RotationX const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationX const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from RotationY

double dist(RotationY const &r1, Rotation3D const &r2);
double dist(RotationY const &r1, AxisAngle const &r2);
double dist(RotationY const &r1, EulerAngles const &r2);
double dist(RotationY const &r1, Quaternion const &r2);
double dist(RotationY const &r1, RotationX const &r2);
double dist(RotationY const &r1, RotationY const &r2);
double dist(RotationY const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationY const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

// ----------------------------------------------------------------------
// Distance from RotationZ

double dist(RotationZ const &r1, Rotation3D const &r2);
double dist(RotationZ const &r1, AxisAngle const &r2);
double dist(RotationZ const &r1, EulerAngles const &r2);
double dist(RotationZ const &r1, Quaternion const &r2);
double dist(RotationZ const &r1, RotationX const &r2);
double dist(RotationZ const &r1, RotationY const &r2);
double dist(RotationZ const &r1, RotationZ const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::Rotation3D const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::AxisAngle const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::EulerAngles const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::Quaternion const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::RotationX const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::RotationY const &r2);
double dist(::ROOT::ROOT_MATH_ARCH::RotationZ const &r1, ::ROOT::ROOT_MATH_ARCH::RotationZ const &r2);

} // namespace gv_detail
} // namespace ROOT_MATH_ARCH
Expand Down
2 changes: 0 additions & 2 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/AxisAngle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#include "MathX/GenVectorX/MathHeaders.h"

using namespace ROOT::ROOT_MATH_ARCH;

namespace ROOT {
namespace ROOT_MATH_ARCH {

Expand Down
2 changes: 0 additions & 2 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/Boost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

#include "MathX/GenVectorX/AccHeaders.h"

using namespace ROOT::ROOT_MATH_ARCH;

namespace ROOT {

namespace ROOT_MATH_ARCH {
Expand Down
14 changes: 6 additions & 8 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/BoostX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

#include "MathX/GenVectorX/AccHeaders.h"

using namespace ROOT::ROOT_MATH_ARCH;

namespace ROOT {

namespace ROOT_MATH_ARCH {
Expand Down Expand Up @@ -127,7 +125,7 @@ class BoostX {
/**
The beta vector for this boost
*/
typedef DisplacementVector3D<Cartesian3D<double>, DefaultCoordinateSystemTag> XYZVector;
typedef ::ROOT::ROOT_MATH_ARCH::DisplacementVector3D<::ROOT::ROOT_MATH_ARCH::Cartesian3D<double>, ::ROOT::ROOT_MATH_ARCH::DefaultCoordinateSystemTag> XYZVector;
XYZVector BetaVector() const;

/**
Expand All @@ -144,7 +142,7 @@ class BoostX {
Lorentz transformation operation on a Minkowski ('Cartesian')
LorentzVector
*/
LorentzVector<PxPyPzE4D<double>> operator()(const LorentzVector<PxPyPzE4D<double>> &v) const;
LorentzVector<::ROOT::ROOT_MATH_ARCH::PxPyPzE4D<double>> operator()(const LorentzVector<::ROOT::ROOT_MATH_ARCH::PxPyPzE4D<double>> &v) const;

/**
Lorentz transformation operation on a LorentzVector in any
Expand All @@ -153,8 +151,8 @@ class BoostX {
template <class CoordSystem>
LorentzVector<CoordSystem> operator()(const LorentzVector<CoordSystem> &v) const
{
LorentzVector<PxPyPzE4D<double>> xyzt(v);
LorentzVector<PxPyPzE4D<double>> r_xyzt = operator()(xyzt);
LorentzVector<::ROOT::ROOT_MATH_ARCH::PxPyPzE4D<double>> xyzt(v);
LorentzVector<::ROOT::ROOT_MATH_ARCH::PxPyPzE4D<double>> r_xyzt = operator()(xyzt);
return LorentzVector<CoordSystem>(r_xyzt);
}

Expand All @@ -166,8 +164,8 @@ class BoostX {
template <class Foreign4Vector>
Foreign4Vector operator()(const Foreign4Vector &v) const
{
LorentzVector<PxPyPzE4D<double>> xyzt(v);
LorentzVector<PxPyPzE4D<double>> r_xyzt = operator()(xyzt);
LorentzVector<::ROOT::ROOT_MATH_ARCH::PxPyPzE4D<double>> xyzt(v);
LorentzVector<::ROOT::ROOT_MATH_ARCH::PxPyPzE4D<double>> r_xyzt = operator()(xyzt);
return Foreign4Vector(r_xyzt.X(), r_xyzt.Y(), r_xyzt.Z(), r_xyzt.T());
}

Expand Down
Loading
Loading