Skip to content

Please consider the following formatting changes to #4541 #1

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

Open
alibuild wants to merge 1 commit into
base: mybranch
Choose a base branch
from
Open

Please consider the following formatting changes to #4541 #1

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
2 changes: 1 addition & 1 deletion PWGDQ/Core/HistogramsLibrary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
hm->AddHistogram(histClass, "Psi2B_CentFT0C", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 100, -2.0, 2.0, VarManager::kPsi2B);
hm->AddHistogram(histClass, "Psi2C_CentFT0C", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 100, -2.0, 2.0, VarManager::kPsi2C);
}

if (subGroupStr.Contains("res")) {
hm->AddHistogram(histClass, "R2SP_CentV0M", "", true, 9, 0.0, 90.0, VarManager::kCentVZERO, 100, -1.0, 1.0, VarManager::kR2SP);
hm->AddHistogram(histClass, "R3SP_CentV0M", "", true, 9, 0.0, 90.0, VarManager::kCentVZERO, 100, -1.0, 1.0, VarManager::kR3SP);
Expand Down
9 changes: 4 additions & 5 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,8 @@ class VarManager : public TObject
static void FillDileptonCharmHadron(DQ const& dilepton, HF const& charmHadron, H hfHelper, T& bdtScoreCharmHad, float* values = nullptr);
template <typename C, typename A>
static void FillQVectorFromGFW(C const& collision, A const& compA2, A const& compB2, A const& compC2, A const& compA3, A const& compB3, A const& compC3, float normA = 1.0, float normB = 1.0, float normC = 1.0, float* values = nullptr);
//static void FillEventPlaneABC(A const& EpA, A const& EpB, A const& EpC, float* values = nullptr);
// static void FillEventPlaneABC(A const& EpA, A const& EpB, A const& EpC, float* values = nullptr);

template <int pairType, typename T1, typename T2>
static void FillPairVn(T1 const& t1, T2 const& t2, float* values = nullptr);

Expand Down Expand Up @@ -1059,7 +1059,6 @@ void VarManager::FillEvent(T const& event, float* values)
values[kPsi2A] = getEventPlane(2, event.q2x0a(), event.q2y0a());
values[kPsi2B] = getEventPlane(2, event.q2x0b(), event.q2y0b());
values[kPsi2C] = getEventPlane(2, event.q2x0c(), event.q2y0c());

}

if constexpr ((fillMap & CollisionMC) > 0) {
Expand Down Expand Up @@ -2403,7 +2402,7 @@ void VarManager::FillQVectorFromGFW(C const& collision, A const& compA2, A const

// TODO: provide different computations for R
// Compute the R factor using the 2 sub-events technique for second and third harmonic
//Compute event planes
// Compute event planes
auto Psi2B = getEventPlane(2, values[kQ2X0B], values[kQ2Y0B]);
auto Psi3B = getEventPlane(3, values[kQ3X0B], values[kQ3Y0B]);
auto Psi2C = getEventPlane(2, values[kQ2X0C], values[kQ2Y0C]);
Expand Down Expand Up @@ -2459,7 +2458,7 @@ void VarManager::FillPairVn(T1 const& t1, T2 const& t2, float* values)
values[kU3Q3] = values[kQ3X0A] * std::cos(3 * v12.Phi()) + values[kQ3Y0A] * std::sin(3 * v12.Phi());
values[kCos2DeltaPhi] = std::cos(2 * (v12.Phi() - getEventPlane(2, values[kQ2X0A], values[kQ2Y0A])));
values[kCos3DeltaPhi] = std::cos(3 * (v12.Phi() - getEventPlane(3, values[kQ3X0A], values[kQ3Y0A])));

if (isnan(VarManager::fgValues[VarManager::kU2Q2]) == true) {
values[kU2Q2] = -999.;
values[kU3Q3] = -999.;
Expand Down
6 changes: 2 additions & 4 deletions PWGDQ/DataModel/ReducedInfoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,7 @@ DECLARE_SOA_TABLE(DileptonsFlow, "AOD", "RTDILEPTONFLOW", //!
reducedpair::Cos3DeltaPhi,
reducedpair::Psi2A,
reducedpair::Psi2B,
reducedpair::Psi2C
);
reducedpair::Psi2C);

// Dilepton collision information (joined with DileptonsExtra) allowing to connect different tables (cross PWGs)
DECLARE_SOA_TABLE(DileptonsInfo, "AOD", "RTDILEPTONINFO",
Expand Down Expand Up @@ -534,8 +533,7 @@ DECLARE_SOA_TABLE(DimuonsAll, "AOD", "RTDIMUONALL", //!
reducedpair::Cos3DeltaPhi,
reducedpair::Psi2A,
reducedpair::Psi2B,
reducedpair::Psi2C
);
reducedpair::Psi2C);

using Dilepton = Dileptons::iterator;
using DileptonExtra = DileptonsExtra::iterator;
Expand Down
2 changes: 1 addition & 1 deletion PWGDQ/Tasks/dqEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ struct AnalysisSameEventPairing {
t2.reducedMCTrack().pt(), t2.reducedMCTrack().eta(), t2.reducedMCTrack().phi(), t2.reducedMCTrack().e(),
t1.reducedMCTrack().vx(), t1.reducedMCTrack().vy(), t1.reducedMCTrack().vz(), t1.reducedMCTrack().vt(),
t2.reducedMCTrack().vx(), t2.reducedMCTrack().vy(), t2.reducedMCTrack().vz(), t2.reducedMCTrack().vt(),
t1.isAmbiguous(), t2.isAmbiguous(), -999., -999., -999., -999.,-999., -999., -999.);
t1.isAmbiguous(), t2.isAmbiguous(), -999., -999., -999., -999., -999., -999., -999.);
}
}

Expand Down
2 changes: 0 additions & 2 deletions PWGDQ/Tasks/dqFlow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,10 @@ struct DQEventQvector {
}
}


// Fill the tree for the reduced event table with Q vector quantities
if (fEventCut->IsSelected(VarManager::fgValues)) {
eventQvector(VarManager::fgValues[VarManager::kQ2X0A], VarManager::fgValues[VarManager::kQ2Y0A], VarManager::fgValues[VarManager::kQ2X0B], VarManager::fgValues[VarManager::kQ2Y0B], VarManager::fgValues[VarManager::kQ2X0C], VarManager::fgValues[VarManager::kQ2Y0C], VarManager::fgValues[VarManager::kMultA], VarManager::fgValues[VarManager::kMultC], VarManager::fgValues[VarManager::kMultC], VarManager::fgValues[VarManager::kQ3X0A], VarManager::fgValues[VarManager::kQ3Y0A], VarManager::fgValues[VarManager::kQ3X0B], VarManager::fgValues[VarManager::kQ3Y0B], VarManager::fgValues[VarManager::kQ3X0C], VarManager::fgValues[VarManager::kQ3Y0C]);
}

}

// Process to fill Q vector using barrel tracks in a reduced event table for barrel/muon tracks flow related analyses Run 2
Expand Down
2 changes: 1 addition & 1 deletion PWGDQ/Tasks/tableReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ struct AnalysisSameEventPairing {
}

if constexpr (eventHasQvector) {
dileptonFlowList(VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3], VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi],VarManager::fgValues[VarManager::kR2SP],VarManager::fgValues[VarManager::kR2EP],VarManager::fgValues[VarManager::kCentFT0C]);
dileptonFlowList(VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kU3Q3], VarManager::fgValues[VarManager::kCos2DeltaPhi], VarManager::fgValues[VarManager::kCos3DeltaPhi], VarManager::fgValues[VarManager::kR2SP], VarManager::fgValues[VarManager::kR2EP], VarManager::fgValues[VarManager::kCentFT0C]);
}

int iCut = 0;
Expand Down