Skip to content

[PWGEM] Fix includes and using statements #15385

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

Draft
vkucera wants to merge 1 commit into
base: master
Choose a base branch
from
+5,177 −4,070
Draft

[PWGEM] Fix includes and using statements #15385

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
6 changes: 5 additions & 1 deletion PWGEM/Dilepton/Core/DielectronCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@

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

#include "Framework/Logger.h"
#include <Framework/Logger.h>

#include <Rtypes.h>

#include <cstdint>
#include <functional>
#include <set>
#include <utility>

Expand Down
30 changes: 18 additions & 12 deletions PWGEM/Dilepton/Core/DielectronCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,27 @@
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
#include "PWGEM/Dilepton/Utils/PairUtilities.h"

#include "CommonConstants/PhysicsConstants.h"
#include "Framework/DataTypes.h"
#include "Framework/Logger.h"
#include "Common/Core/RecoDecay.h"

#include "Math/Vector4D.h"
#include "TNamed.h"
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/Logger.h>
#include <MathUtils/Utils.h>

#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
#include <Math/Vector4Dfwd.h>
#include <TNamed.h>

#include <Rtypes.h>

#include <algorithm>
#include <cmath>
#include <cstdint>
#include <functional>
#include <set>
#include <string>
#include <utility>
#include <vector>

using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
using namespace o2::aod::pwgem::dilepton::utils::pairutil;
#include <math.h>

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

float dca_ee_3d = pairDCAQuadSum(dca3DinSigma(t1), dca3DinSigma(t2));
float phiv = getPhivPair(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz(), t1.sign(), t2.sign(), bz);
float opAng = getOpeningAngle(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz());
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));
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);
float opAng = o2::aod::pwgem::dilepton::utils::pairutil::getOpeningAngle(t1.px(), t1.py(), t1.pz(), t2.px(), t2.py(), t2.pz());

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

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

case DielectronCuts::kDCAxy:
return std::fabs(track.dcaXY()) < ((mMaxDcaXYPtDep) ? mMaxDcaXYPtDep(track.pt()) : mMaxDcaXY);
Expand Down
702 changes: 359 additions & 343 deletions PWGEM/Dilepton/Core/Dilepton.h
View file
Open in desktop

Large diffs are not rendered by default.

916 changes: 519 additions & 397 deletions PWGEM/Dilepton/Core/DileptonHadronMPC.h
View file
Open in desktop

Large diffs are not rendered by default.

868 changes: 443 additions & 425 deletions PWGEM/Dilepton/Core/DileptonMC.h
View file
Open in desktop

Large diffs are not rendered by default.

522 changes: 259 additions & 263 deletions PWGEM/Dilepton/Core/DileptonProducer.h
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion PWGEM/Dilepton/Core/DimuonCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@

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

#include "Framework/Logger.h"
#include <Framework/Logger.h>

#include <Rtypes.h>

#include <functional>
#include <vector>

ClassImp(DimuonCut);
Expand Down
33 changes: 17 additions & 16 deletions PWGEM/Dilepton/Core/DimuonCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,22 @@

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

#include "CommonConstants/PhysicsConstants.h"
#include "Framework/DataTypes.h"
#include "Framework/Logger.h"
#include "MathUtils/Utils.h"

#include "Math/Vector4D.h"
#include "TNamed.h"

#include <algorithm>
#include <set>
#include <string>
#include <utility>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/DataTypes.h>
#include <MathUtils/Utils.h>

#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
#include <Math/Vector4Dfwd.h>
#include <TNamed.h>

#include <Rtypes.h>

#include <cmath>
#include <cstdint>
#include <functional>
#include <vector>

using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
#include <math.h>

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

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

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

case DimuonCuts::kMFTHitMap: {
std::vector<bool> mftHitMap{checkMFTHitMap<0, 1>(track), checkMFTHitMap<2, 3>(track), checkMFTHitMap<4, 5>(track), checkMFTHitMap<6, 7>(track), checkMFTHitMap<8, 9>(track)};
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)};
for (const auto& iDisk : mRequiredMFTDisks) {
if (!mftHitMap[iDisk]) {
return false;
Expand Down
4 changes: 3 additions & 1 deletion PWGEM/Dilepton/Core/EMEventCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@

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

#include "Framework/Logger.h"
#include <Framework/Logger.h>

#include <Rtypes.h>

ClassImp(EMEventCut);

Expand Down
7 changes: 2 additions & 5 deletions PWGEM/Dilepton/Core/EMEventCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@

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

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/TriggerAliases.h"
#include <TNamed.h>

#include "TNamed.h"

using namespace std;
#include <Rtypes.h>

class EMEventCut : public TNamed
{
Expand Down
12 changes: 5 additions & 7 deletions PWGEM/Dilepton/Core/EMTrackCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@

#include "PWGEM/Dilepton/Core/EMTrackCut.h"

#include "Framework/Logger.h"
#include <Framework/Logger.h>

#include <Rtypes.h>

#include <cstdint>

ClassImp(EMTrackCut);

Expand All @@ -38,12 +42,6 @@ void EMTrackCut::SetTrackPhiRange(float minPhi, float maxPhi)
LOG(info) << "EMTrack Cut, set track phi range (rad.): " << mMinTrackPhi << " - " << mMaxTrackPhi;
}

// void EMTrackCut::SetTrackMaxDcaXYPtDep(std::function<float(float)> ptDepCut)
// {
// mMaxDcaXYPtDep = ptDepCut;
// LOG(info) << "EMTrack Cut, set max DCA xy pt dep: " << mMaxDcaXYPtDep(1.0);
// }

void EMTrackCut::SetTrackBit(uint16_t bit)
{
mTrackBit = bit;
Expand Down
21 changes: 7 additions & 14 deletions PWGEM/Dilepton/Core/EMTrackCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
#ifndef PWGEM_DILEPTON_CORE_EMTRACKCUT_H_
#define PWGEM_DILEPTON_CORE_EMTRACKCUT_H_

#include "Framework/Logger.h"
#include <TNamed.h>

#include "TNamed.h"
#include <Rtypes.h>

#include <cstdint>

class EMTrackCut : public TNamed
{
Expand All @@ -42,9 +44,11 @@ class EMTrackCut : public TNamed
if (!IsSelectedTrack(track, EMTrackCuts::kTrackPtRange)) {
return false;
}

if (!IsSelectedTrack(track, EMTrackCuts::kTrackEtaRange)) {
return false;
}

if (!IsSelectedTrack(track, EMTrackCuts::kTrackPhiRange)) {
return false;
}
Expand All @@ -69,15 +73,8 @@ class EMTrackCut : public TNamed
case EMTrackCuts::kTrackPhiRange:
return track.phi() > mMinTrackPhi && track.phi() < mMaxTrackPhi;

case EMTrackCuts::kTrackBit: {
// for (int i = 0; i < 10; i++) {
// if ((mTrackBit & (1 << i)) > 0 && !((track.trackBit() & (1 << i)) > 0)) {
// return false;
// }
// }
// return true;
case EMTrackCuts::kTrackBit:
return (track.trackBit() & mTrackBit) >= mTrackBit;
}

default:
return false;
Expand All @@ -91,14 +88,10 @@ class EMTrackCut : public TNamed
void SetTrackBit(uint16_t bits);

private:
// kinematic cuts
float mMinTrackPt{0.f}, mMaxTrackPt{1e10f}; // range in pT
float mMinTrackEta{-1e10f}, mMaxTrackEta{1e10f}; // range in eta
float mMinTrackPhi{0.f}, mMaxTrackPhi{6.3}; // range in phi

// track quality cuts
uint16_t mTrackBit{0};
// std::function<float(float)> mMaxDcaXYPtDep{}; // max dca in xy plane as function of pT

ClassDef(EMTrackCut, 1);
};
Expand Down
Loading
Loading