Skip to content

Commit 81ba563

Browse files
vkuceravkucera
committed
Fix includes and using statements
1 parent 99d55ef commit 81ba563

180 files changed

Lines changed: 5177 additions & 4070 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PWGEM/Dilepton/Core/DielectronCut.cxx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515

1616
#include "PWGEM/Dilepton/Core/DielectronCut.h"
1717

18-
#include "Framework/Logger.h"
18+
#include <Framework/Logger.h>
1919

20+
#include <Rtypes.h>
21+
22+
#include <cstdint>
23+
#include <functional>
2024
#include <set>
2125
#include <utility>
2226

‎PWGEM/Dilepton/Core/DielectronCut.h‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,27 @@
1919
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
2020
#include "PWGEM/Dilepton/Utils/PairUtilities.h"
2121

22-
#include "CommonConstants/PhysicsConstants.h"
23-
#include "Framework/DataTypes.h"
24-
#include "Framework/Logger.h"
22+
#include "Common/Core/RecoDecay.h"
2523

26-
#include "Math/Vector4D.h"
27-
#include "TNamed.h"
24+
#include <CommonConstants/PhysicsConstants.h>
25+
#include <Framework/Logger.h>
26+
#include <MathUtils/Utils.h>
27+
28+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
29+
#include <Math/Vector4Dfwd.h>
30+
#include <TNamed.h>
31+
32+
#include <Rtypes.h>
2833

2934
#include <algorithm>
35+
#include <cmath>
36+
#include <cstdint>
37+
#include <functional>
3038
#include <set>
31-
#include <string>
3239
#include <utility>
3340
#include <vector>
3441

35-
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
36-
using namespace o2::aod::pwgem::dilepton::utils::pairutil;
42+
#include <math.h>
3743

3844
class DielectronCut : public TNamed
3945
{
@@ -108,9 +114,9 @@ class DielectronCut : public TNamed
108114
ROOT::Math::PtEtaPhiMVector v2(t2.pt(), t2.eta(), t2.phi(), o2::constants::physics::MassElectron);
109115
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
110116

111-
float dca_ee_3d = pairDCAQuadSum(dca3DinSigma(t1), dca3DinSigma(t2));
112-
float phiv = getPhivPair(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz(), t1.sign(), t2.sign(), bz);
113-
float opAng = getOpeningAngle(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz());
117+
float dca_ee_3d = o2::aod::pwgem::dilepton::utils::pairutil::pairDCAQuadSum(o2::aod::pwgem::dilepton::utils::emtrackutil::dca3DinSigma(t1), o2::aod::pwgem::dilepton::utils::emtrackutil::dca3DinSigma(t2));
118+
float phiv = o2::aod::pwgem::dilepton::utils::pairutil::getPhivPair(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz(), t1.sign(), t2.sign(), bz);
119+
float opAng = o2::aod::pwgem::dilepton::utils::pairutil::getOpeningAngle(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz());
114120

115121
if (v12.M() < mMinMee || mMaxMee < v12.M()) {
116122
return false;
@@ -457,7 +463,7 @@ class DielectronCut : public TNamed
457463
return mMinChi2PerClusterTPC < track.tpcChi2NCl() && track.tpcChi2NCl() < mMaxChi2PerClusterTPC;
458464

459465
case DielectronCuts::kDCA3Dsigma:
460-
return mMinDca3D < dca3DinSigma(track) && dca3DinSigma(track) < mMaxDca3D; // in sigma for single leg
466+
return mMinDca3D < o2::aod::pwgem::dilepton::utils::emtrackutil::dca3DinSigma(track) && o2::aod::pwgem::dilepton::utils::emtrackutil::dca3DinSigma(track) < mMaxDca3D; // in sigma for single leg
461467

462468
case DielectronCuts::kDCAxy:
463469
return std::fabs(track.dcaXY()) < ((mMaxDcaXYPtDep) ? mMaxDcaXYPtDep(track.pt()) : mMaxDcaXY);

‎PWGEM/Dilepton/Core/Dilepton.h‎

Lines changed: 359 additions & 343 deletions
Large diffs are not rendered by default.

‎PWGEM/Dilepton/Core/DileptonHadronMPC.h‎

Lines changed: 519 additions & 397 deletions
Large diffs are not rendered by default.

‎PWGEM/Dilepton/Core/DileptonMC.h‎

Lines changed: 443 additions & 425 deletions
Large diffs are not rendered by default.

‎PWGEM/Dilepton/Core/DileptonProducer.h‎

Lines changed: 259 additions & 263 deletions
Large diffs are not rendered by default.

‎PWGEM/Dilepton/Core/DimuonCut.cxx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515

1616
#include "PWGEM/Dilepton/Core/DimuonCut.h"
1717

18-
#include "Framework/Logger.h"
18+
#include <Framework/Logger.h>
1919

20+
#include <Rtypes.h>
21+
22+
#include <functional>
2023
#include <vector>
2124

2225
ClassImp(DimuonCut);

‎PWGEM/Dilepton/Core/DimuonCut.h‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,22 @@
1818

1919
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
2020

21-
#include "CommonConstants/PhysicsConstants.h"
22-
#include "Framework/DataTypes.h"
23-
#include "Framework/Logger.h"
24-
#include "MathUtils/Utils.h"
25-
26-
#include "Math/Vector4D.h"
27-
#include "TNamed.h"
28-
29-
#include <algorithm>
30-
#include <set>
31-
#include <string>
32-
#include <utility>
21+
#include <CommonConstants/PhysicsConstants.h>
22+
#include <Framework/DataTypes.h>
23+
#include <MathUtils/Utils.h>
24+
25+
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
26+
#include <Math/Vector4Dfwd.h>
27+
#include <TNamed.h>
28+
29+
#include <Rtypes.h>
30+
31+
#include <cmath>
32+
#include <cstdint>
33+
#include <functional>
3334
#include <vector>
3435

35-
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
36+
#include <math.h>
3637

3738
class DimuonCut : public TNamed
3839
{
@@ -92,8 +93,8 @@ class DimuonCut : public TNamed
9293
ROOT::Math::PtEtaPhiMVector v2(t2.pt(), t2.eta(), t2.phi(), o2::constants::physics::MassMuon);
9394
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
9495

95-
float dca_xy_t1 = fwdDcaXYinSigma(t1);
96-
float dca_xy_t2 = fwdDcaXYinSigma(t2);
96+
float dca_xy_t1 = o2::aod::pwgem::dilepton::utils::emtrackutil::fwdDcaXYinSigma(t1);
97+
float dca_xy_t2 = o2::aod::pwgem::dilepton::utils::emtrackutil::fwdDcaXYinSigma(t2);
9798
float pair_dca_xy = std::sqrt((dca_xy_t1 * dca_xy_t1 + dca_xy_t2 * dca_xy_t2) / 2.);
9899

99100
if (v12.M() < mMinMass || mMaxMass < v12.M()) {
@@ -228,7 +229,7 @@ class DimuonCut : public TNamed
228229
return mEnableTTCA ? true : track.isAssociatedToMPC();
229230

230231
case DimuonCuts::kMFTHitMap: {
231-
std::vector<bool> mftHitMap{checkMFTHitMap<0, 1>(track), checkMFTHitMap<2, 3>(track), checkMFTHitMap<4, 5>(track), checkMFTHitMap<6, 7>(track), checkMFTHitMap<8, 9>(track)};
232+
std::vector<bool> mftHitMap{o2::aod::pwgem::dilepton::utils::emtrackutil::checkMFTHitMap<0, 1>(track), o2::aod::pwgem::dilepton::utils::emtrackutil::checkMFTHitMap<2, 3>(track), o2::aod::pwgem::dilepton::utils::emtrackutil::checkMFTHitMap<4, 5>(track), o2::aod::pwgem::dilepton::utils::emtrackutil::checkMFTHitMap<6, 7>(track), o2::aod::pwgem::dilepton::utils::emtrackutil::checkMFTHitMap<8, 9>(track)};
232233
for (const auto& iDisk : mRequiredMFTDisks) {
233234
if (!mftHitMap[iDisk]) {
234235
return false;

‎PWGEM/Dilepton/Core/EMEventCut.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
#include "PWGEM/Dilepton/Core/EMEventCut.h"
1717

18-
#include "Framework/Logger.h"
18+
#include <Framework/Logger.h>
19+
20+
#include <Rtypes.h>
1921

2022
ClassImp(EMEventCut);
2123

‎PWGEM/Dilepton/Core/EMEventCut.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818

1919
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
2020

21-
#include "Common/CCDB/EventSelectionParams.h"
22-
#include "Common/CCDB/TriggerAliases.h"
21+
#include <TNamed.h>
2322

24-
#include "TNamed.h"
25-
26-
using namespace std;
23+
#include <Rtypes.h>
2724

2825
class EMEventCut : public TNamed
2926
{

0 commit comments

Comments
 (0)