Skip to content

Commit dfb771c

Browse files
authored
Merge pull request cms-sw#33892 from mrodozov/change-pi-literals
Change PI using literals in DataFormats/Math
2 parents ae135e8 + 32bf4b9 commit dfb771c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

DataFormats/Math/interface/angle_units.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ namespace angle_units {
1111
namespace operators {
1212

1313
// Angle
14-
constexpr double operator"" _pi(long double x) { return x * piRadians; }
15-
constexpr double operator"" _pi(unsigned long long int x) { return x * piRadians; }
14+
constexpr double operator"" _pi(long double x) { return double(x) * M_PI; }
15+
constexpr double operator"" _pi(unsigned long long int x) { return double(x) * M_PI; }
1616
constexpr double operator"" _deg(long double deg) { return deg / degPerRad; }
1717
constexpr double operator"" _deg(unsigned long long int deg) { return deg / degPerRad; }
1818
constexpr double operator"" _rad(long double rad) { return rad * 1.; }

DataFormats/Math/interface/deltaPhi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ namespace angle0to2pi {
6565

6666
template <class valType>
6767
inline constexpr valType make0To2pi(valType angle) {
68-
constexpr valType twoPi = 2._pi;
69-
constexpr valType oneOverTwoPi = 1. / twoPi;
68+
constexpr valType twoPi = 2. * M_PI;
69+
constexpr valType oneOverTwoPi = 1. / (2. * M_PI);
7070
constexpr valType epsilon = 1.e-13;
7171

7272
if ((std::abs(angle) <= epsilon) || (std::abs(twoPi - std::abs(angle)) <= epsilon))

0 commit comments

Comments
 (0)