Skip to content

[mathx] rename CINT to CLING and MAKECINT to ROOTCLING #20652

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

Merged
guitargeek merged 1 commit into from
Dec 14, 2025
Merged

[mathx] rename CINT to CLING and MAKECINT to ROOTCLING #20652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class Cartesian2D {
return *this;
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand All @@ -207,7 +207,7 @@ class Cartesian2D {

} // end namespace ROOT

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
// need to put here setter methods to resolve nasty cyclical dependencies
// I need to include other coordinate systems only when Cartesian is already defined
Expand Down
4 changes: 2 additions & 2 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/Cartesian3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class Cartesian3D {
return *this;
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand All @@ -250,7 +250,7 @@ class Cartesian3D {

} // end namespace ROOT

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
// need to put here setter methods to resolve nasty cyclical dependencies
// I need to include other coordinate systems only when Cartesian is already defined
Expand Down
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/Cylindrical3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class Cylindrical3D {

// (none)

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand Down Expand Up @@ -247,7 +247,7 @@ class Cylindrical3D {

#include "MathX/GenVectorX/Cartesian3D.h"

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#include "MathX/GenVectorX/GenVector_exception.h"
#include "MathX/GenVectorX/CylindricalEta3D.h"
#include "MathX/GenVectorX/Polar3D.h"
Expand All @@ -263,7 +263,7 @@ void Cylindrical3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz)
*this = Cartesian3D<Scalar>(xx, yy, zz);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)

// ====== Set member functions for coordinates in other systems =======
Expand Down
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/CylindricalEta3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class CylindricalEta3D {

// (none)

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand Down Expand Up @@ -283,7 +283,7 @@ class CylindricalEta3D {

#include "MathX/GenVectorX/Cartesian3D.h"

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#include "MathX/GenVectorX/GenVector_exception.h"
#include "MathX/GenVectorX/Polar3D.h"
#endif
Expand All @@ -298,7 +298,7 @@ void CylindricalEta3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz)
*this = Cartesian3D<Scalar>(xx, yy, zz);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)

// ====== Set member functions for coordinates in other systems =======
Expand Down
2 changes: 1 addition & 1 deletion math/experimental/genvectorx/inc/MathX/GenVectorX/DisplacementVector3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ operator-(DisplacementVector3D<CoordSystem1, U> v1, DisplacementVector3D<CoordSy
return v1 -= v2;
}

// #endif // not __CINT__
// #endif // not __CLING__

/**
Multiplication of a displacement vector by real number a*v
Expand Down
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/Polar2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class Polar2D {

// (none)

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand All @@ -207,7 +207,7 @@ class Polar2D {

#include "MathX/GenVectorX/Cartesian2D.h"

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#include "MathX/GenVectorX/GenVector_exception.h"
#endif

Expand All @@ -221,7 +221,7 @@ void Polar2D<T>::SetXY(Scalar a, Scalar b)
*this = Cartesian2D<Scalar>(a, b);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)

// ====== Set member functions for coordinates in other systems =======
Expand Down
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/Polar3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ class Polar3D {

// (none)

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand Down Expand Up @@ -244,7 +244,7 @@ class Polar3D {

#include "MathX/GenVectorX/Cartesian3D.h"

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#include "MathX/GenVectorX/GenVector_exception.h"
#include "MathX/GenVectorX/CylindricalEta3D.h"
#endif
Expand All @@ -259,7 +259,7 @@ void Polar3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz)
*this = Cartesian3D<Scalar>(xx, yy, zz);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
// ====== Set member functions for coordinates in other systems =======

Expand Down
8 changes: 4 additions & 4 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiE4D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class PtEtaPhiE4D {
Scalar z() const { return Z(); }
Scalar t() const { return E(); }

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand All @@ -384,7 +384,7 @@ class PtEtaPhiE4D {

// move implementations here to avoid circle dependencies
#include "MathX/GenVectorX/PxPyPzE4D.h"
#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#include "MathX/GenVectorX/PtEtaPhiM4D.h"
#endif

Expand All @@ -398,7 +398,7 @@ inline void PtEtaPhiE4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz,
*this = PxPyPzE4D<Scalar>(px, py, pz, e);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)

// ====== Set member functions for coordinates in other systems =======
Expand Down Expand Up @@ -440,7 +440,7 @@ inline void PtEtaPhiE4D<ScalarType>::SetM(Scalar m)
*this = PtEtaPhiE4D<Scalar>(v);
}

#endif // endif __MAKE__CINT || G__DICTIONARY
#endif // endif __ROOTCLING__ || G__DICTIONARY
#endif

} // end namespace ROOT_MATH_ARCH
Expand Down
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/PtEtaPhiM4D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ class PtEtaPhiM4D {
Scalar z() const { return Z(); }
Scalar t() const { return E(); }

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand Down Expand Up @@ -415,7 +415,7 @@ inline void PtEtaPhiM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz,
*this = PxPyPzE4D<Scalar>(px, py, pz, e);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)

// ====== Set member functions for coordinates in other systems =======
Expand Down Expand Up @@ -457,7 +457,7 @@ void PtEtaPhiM4D<ScalarType>::SetE(Scalar energy)
*this = PtEtaPhiM4D<Scalar>(v);
}

#endif // endif __MAKE__CINT || G__DICTIONARY
#endif // endif __ROOTCLING__ || G__DICTIONARY
#endif

} // end namespace ROOT_MATH_ARCH
Expand Down
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzE4D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class PxPyPzE4D {
Scalar z() const { return fZ; }
Scalar t() const { return fT; }

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand Down Expand Up @@ -347,7 +347,7 @@ class PxPyPzE4D {
} // end namespace ROOT_MATH_ARCH
} // end namespace ROOT

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)
// move implementations here to avoid circle dependencies

Expand Down Expand Up @@ -403,7 +403,7 @@ void PxPyPzE4D<ScalarType>::SetM(Scalar m)

} // end namespace ROOT

#endif // endif __MAKE__CINT || G__DICTIONARY
#endif // endif __ROOTCLING__ || G__DICTIONARY
#endif

#endif // ROOT_MathX_GenVectorX_PxPyPzE4D
6 changes: 3 additions & 3 deletions math/experimental/genvectorx/inc/MathX/GenVectorX/PxPyPzM4D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ class PxPyPzM4D {
Scalar z() const { return Z(); }
Scalar t() const { return E(); }

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)

// ====== Set member functions for coordinates in other systems =======

Expand Down Expand Up @@ -394,7 +394,7 @@ inline void PxPyPzM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz, S
*this = PxPyPzE4D<Scalar>(px, py, pz, e);
}

#if defined(__MAKECINT__) || defined(G__DICTIONARY)
#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
#if !defined(ROOT_MATH_SYCL) && !defined(ROOT_MATH_CUDA)

// ====== Set member functions for coordinates in other systems =======
Expand Down Expand Up @@ -438,7 +438,7 @@ inline void PxPyPzM4D<ScalarType>::SetE(ScalarType energy)
*this = PxPyPzM4D<ScalarType>(v);
}

#endif // endif __MAKE__CINT || G__DICTIONARY
#endif // endif __ROOTCLING__ || G__DICTIONARY
#endif

} // end namespace ROOT_MATH_ARCH
Expand Down
2 changes: 1 addition & 1 deletion math/experimental/genvectorx/inc/MathX/GenVectorX/Transform3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class Transform3D {
*/
explicit Transform3D(const Translation3D<T> &t) { AssignFrom(t.Vect()); }

// #if !defined(__MAKECINT__) && !defined(G__DICTIONARY) // this is ambiguous with double * , double *
// #if !defined(__ROOTCLING__) && !defined(G__DICTIONARY) // this is ambiguous with double * , double *

#ifdef OLD_VERSION
/**
Expand Down
2 changes: 1 addition & 1 deletion math/experimental/genvectorx/inc/MathX/GenVectorX/VectorUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ inline typename Vector1::Scalar InvariantMass2(const Vector1 &v1, const Vector2

// rotation and transformations

#ifndef __CINT__
#ifndef __CLING__
/**
rotation along X axis for a generic vector by an Angle alpha
returning a new vector.
Expand Down
4 changes: 2 additions & 2 deletions math/experimental/genvectorx/inc/MathX/LinkDef_GenVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @(#)root/mathcore:$Id$
// Authors: W. Brown, M. Fischler, L. Moneta 2005

#ifdef __CINT__
#ifdef __CLING__

#pragma link off all globals;
#pragma link off all classes;
Expand Down Expand Up @@ -669,7 +669,7 @@
#pragma link C++ typedef ROOT::Math::RhoZPhiVector;
#pragma link C++ typedef ROOT::Math::PxPyPzEVector;

// tyoedef for floating types
// typedef for floating types

#pragma link C++ typedef ROOT::Math::XYVectorF;
#pragma link C++ typedef ROOT::Math::Polar2DVectorF;
Expand Down
2 changes: 1 addition & 1 deletion math/experimental/genvectorx/inc/MathX/LinkDef_GenVector32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// Linkdef for Doublr32_t types

#ifdef __CINT__
#ifdef __CLING__

#pragma link off all globals;
#pragma link off all classes;
Expand Down
Loading