Skip to content

Commit 7c43d6d

Browse files
vkuceravkucera
authored
Fix namespace pollution from std and o2::constants (#11851)
* Remove std namespace from CCDBDownloader.h * Remove std namespace from DataBlockBase.h * Remove math namespace from AnalysisDataModel.h * Clean TPCSimulation/Digitizer.h * Clean SACDecoder.h
1 parent eb9ca41 commit 7c43d6d

6 files changed

Lines changed: 11 additions & 19 deletions

File tree

‎CCDB/include/CCDB/CCDBDownloader.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ typedef struct uv_signal_s uv_signal_t;
2929
typedef struct uv_async_s uv_async_t;
3030
typedef struct uv_handle_s uv_handle_t;
3131

32-
using namespace std;
33-
3432
namespace o2::ccdb
3533
{
3634

‎Detectors/FIT/raw/include/FITRaw/DataBlockBase.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ namespace o2
5858
namespace fit
5959
{
6060

61-
using namespace std;
62-
6361
static constexpr size_t SIZE_WORD = 16;
6462
static constexpr size_t SIZE_WORD_GBT = 10; // should be changed to gloabal variable
6563
static constexpr size_t SIZE_MAX_PAGE = 8192; // should be changed to gloabal variable

‎Detectors/TPC/calibration/include/TPCCalibration/SACDecoder.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "DataFormatsTPC/SAC.h"
3232

3333
using o2::constants::lhc::LHCBunchSpacingMUS;
34-
using std::size_t;
3534

3635
namespace o2::tpc::sac
3736
{

‎Detectors/TPC/simulation/include/TPCSimulation/Digitizer.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
#include <cmath>
2424

25-
using std::vector;
26-
2725
class TTree;
2826
class TH3;
2927

‎Framework/Core/include/Framework/AnalysisDataModel.h‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "CommonConstants/ZDCConstants.h"
2222
#include "SimulationDataFormat/MCGenProperties.h"
2323

24-
using namespace o2::constants::math;
25-
2624
namespace o2
2725
{
2826
namespace aod
@@ -122,13 +120,13 @@ DECLARE_SOA_COLUMN(Snp, snp, float); //!
122120
DECLARE_SOA_COLUMN(Tgl, tgl, float); //!
123121
DECLARE_SOA_COLUMN(Signed1Pt, signed1Pt, float); //! (sign of charge)/Pt in c/GeV. Use pt() and sign() instead
124122
DECLARE_SOA_EXPRESSION_COLUMN(Phi, phi, float, //! Phi of the track, in radians within [0, 2pi)
125-
ifnode(nasin(aod::track::snp) + aod::track::alpha < 0.0f, nasin(aod::track::snp) + aod::track::alpha + TwoPI,
126-
ifnode(nasin(aod::track::snp) + aod::track::alpha >= TwoPI, nasin(aod::track::snp) + aod::track::alpha - TwoPI,
123+
ifnode(nasin(aod::track::snp) + aod::track::alpha < 0.0f, nasin(aod::track::snp) + aod::track::alpha + o2::constants::math::TwoPI,
124+
ifnode(nasin(aod::track::snp) + aod::track::alpha >= o2::constants::math::TwoPI, nasin(aod::track::snp) + aod::track::alpha - o2::constants::math::TwoPI,
127125
nasin(aod::track::snp) + aod::track::alpha)));
128126
DECLARE_SOA_EXPRESSION_COLUMN(Eta, eta, float, //! Pseudorapidity
129-
-1.f * nlog(ntan(PIQuarter - 0.5f * natan(aod::track::tgl))));
127+
-1.f * nlog(ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::track::tgl))));
130128
DECLARE_SOA_EXPRESSION_COLUMN(Pt, pt, float, //! Transverse momentum of the track in GeV/c
131-
ifnode(nabs(aod::track::signed1Pt) <= Almost0, VeryBig, nabs(1.f / aod::track::signed1Pt)));
129+
ifnode(nabs(aod::track::signed1Pt) <= o2::constants::math::Almost0, o2::constants::math::VeryBig, nabs(1.f / aod::track::signed1Pt)));
132130
DECLARE_SOA_DYNAMIC_COLUMN(IsWithinBeamPipe, isWithinBeamPipe, //! Is the track within the beam pipe (= successfully propagated to a collision vertex)
133131
[](float x) -> bool { return (std::fabs(x) < o2::constants::geom::XBeamPipeOuterRef); });
134132
DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign, //! Charge: positive: 1, negative: -1
@@ -156,18 +154,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, //! Momentum in z-direction in GeV/c
156154
});
157155

158156
DECLARE_SOA_EXPRESSION_COLUMN(P, p, float, //! Momentum in Gev/c
159-
ifnode(nabs(aod::track::signed1Pt) <= Almost0, VeryBig, 0.5f * (ntan(PIQuarter - 0.5f * natan(aod::track::tgl)) + 1.f / ntan(PIQuarter - 0.5f * natan(aod::track::tgl))) / nabs(aod::track::signed1Pt)));
157+
ifnode(nabs(aod::track::signed1Pt) <= o2::constants::math::Almost0, o2::constants::math::VeryBig, 0.5f * (ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::track::tgl)) + 1.f / ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::track::tgl))) / nabs(aod::track::signed1Pt)));
160158
DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, //! Track energy, computed under the mass assumption given as input
161159
[](float signed1Pt, float tgl, float mass) -> float {
162160
const auto pt = 1.f / std::abs(signed1Pt);
163-
const auto p = 0.5f * (tan(PIQuarter - 0.5f * atan(tgl)) + 1.f / tan(PIQuarter - 0.5f * atan(tgl))) * pt;
161+
const auto p = 0.5f * (tan(o2::constants::math::PIQuarter - 0.5f * atan(tgl)) + 1.f / tan(o2::constants::math::PIQuarter - 0.5f * atan(tgl))) * pt;
164162
return sqrt(p * p + mass * mass);
165163
});
166164
DECLARE_SOA_DYNAMIC_COLUMN(Rapidity, rapidity, //! Track rapidity, computed under the mass assumption given as input
167165
[](float signed1Pt, float tgl, float mass) -> float {
168166
const auto pt = 1.f / std::abs(signed1Pt);
169167
const auto pz = pt * tgl;
170-
const auto p = 0.5f * (tan(PIQuarter - 0.5f * atan(tgl)) + 1.f / tan(PIQuarter - 0.5f * atan(tgl))) * pt;
168+
const auto p = 0.5f * (tan(o2::constants::math::PIQuarter - 0.5f * atan(tgl)) + 1.f / tan(o2::constants::math::PIQuarter - 0.5f * atan(tgl))) * pt;
171169
const auto energy = sqrt(p * p + mass * mass);
172170
return 0.5f * log((energy + pz) / (energy - pz));
173171
});
@@ -458,11 +456,11 @@ DECLARE_SOA_COLUMN(TrackTimeRes, trackTimeRes, float);
458456
DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign, //! Sign of the track eletric charge
459457
[](float signed1Pt) -> short { return (signed1Pt > 0) ? 1 : -1; });
460458
DECLARE_SOA_EXPRESSION_COLUMN(Eta, eta, float, //!
461-
-1.f * nlog(ntan(PIQuarter - 0.5f * natan(aod::fwdtrack::tgl))));
459+
-1.f * nlog(ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::fwdtrack::tgl))));
462460
DECLARE_SOA_EXPRESSION_COLUMN(Pt, pt, float, //!
463461
ifnode(nabs(aod::fwdtrack::signed1Pt) < o2::constants::math::Almost0, o2::constants::math::VeryBig, nabs(1.f / aod::fwdtrack::signed1Pt)));
464462
DECLARE_SOA_EXPRESSION_COLUMN(P, p, float, //!
465-
ifnode((nabs(aod::fwdtrack::signed1Pt) < o2::constants::math::Almost0) || (nabs(PIQuarter - 0.5f * natan(aod::fwdtrack::tgl)) < o2::constants::math::Almost0), o2::constants::math::VeryBig, 0.5f * (ntan(PIQuarter - 0.5f * natan(aod::fwdtrack::tgl)) + 1.f / ntan(PIQuarter - 0.5f * natan(aod::fwdtrack::tgl))) / nabs(aod::fwdtrack::signed1Pt)));
463+
ifnode((nabs(aod::fwdtrack::signed1Pt) < o2::constants::math::Almost0) || (nabs(o2::constants::math::PIQuarter - 0.5f * natan(aod::fwdtrack::tgl)) < o2::constants::math::Almost0), o2::constants::math::VeryBig, 0.5f * (ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::fwdtrack::tgl)) + 1.f / ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::fwdtrack::tgl))) / nabs(aod::fwdtrack::signed1Pt)));
466464
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //!
467465
[](float pt, float phi) -> float {
468466
return pt * std::cos(phi);
@@ -1360,7 +1358,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, //! True if par
13601358
[](uint8_t flags) -> bool { return (flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary; });
13611359

13621360
DECLARE_SOA_EXPRESSION_COLUMN(Phi, phi, float, //! Phi in the range [0, 2pi)
1363-
PI + natan2(-1.0f * aod::mcparticle::py, -1.0f * aod::mcparticle::px));
1361+
o2::constants::math::PI + natan2(-1.0f * aod::mcparticle::py, -1.0f * aod::mcparticle::px));
13641362
DECLARE_SOA_EXPRESSION_COLUMN(Eta, eta, float, //! Pseudorapidity, conditionally defined to avoid FPEs
13651363
ifnode((nsqrt(aod::mcparticle::px * aod::mcparticle::px +
13661364
aod::mcparticle::py * aod::mcparticle::py +

‎run/SimExamples/McTracksToAOD/mctracks_to_aod_simple_task.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
using namespace o2;
1818
using namespace o2::framework;
19+
using namespace o2::constants::math;
1920

2021
struct AodConsumerTestTask {
2122

0 commit comments

Comments
 (0)