Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions PWGDQ/Core/HistogramsLibrary.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,9 @@
hm->AddHistogram(histClass, "CosThetaStarTPC", "", false, 100, -1.0, 1.0, VarManager::kCosThetaStarTPC);
hm->AddHistogram(histClass, "CosThetaStarFT0A", "", false, 100, -1.0, 1.0, VarManager::kCosThetaStarFT0A);
hm->AddHistogram(histClass, "CosThetaStarFT0C", "", false, 100, -1.0, 1.0, VarManager::kCosThetaStarFT0C);
hm->AddHistogram(histClass, "CosThetaStarRandom", "", false, 100, -1.0, 1.0, VarManager::kCosThetaStarRandom);
hm->AddHistogram(histClass, "Cos2ThetaStarFT0C_Mass", "", true, 50, 2.0, 4.0, VarManager::kMass, 100, -1.0, 1.0, VarManager::kCos2ThetaStarFT0C);
hm->AddHistogram(histClass, "Cos2ThetaStarRandom_Mass", "", true, 50, 2.0, 4.0, VarManager::kMass, 100, -1.0, 1.0, VarManager::kCos2ThetaStarRandom);
}
if (subGroupStr.Contains("upsilon")) {
hm->AddHistogram(histClass, "MassUpsilon_Pt", "", false, 500, 7.0, 12.0, VarManager::kMass, 400, 0.0, 40.0, VarManager::kPt);
Expand Down Expand Up @@ -2357,7 +2360,7 @@
LOG(fatal) << "histClass field should be an array of strings, e.g. [class1, class2]";
return false;
}
for (auto& v : hist->FindMember("histClass")->value.GetArray()) {

Check failure on line 2363 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
if (!v.IsString()) {
LOG(fatal) << "histClass field should be an array of strings, e.g. [class1, class2]";
return false;
Expand Down Expand Up @@ -2513,7 +2516,7 @@
}
}
if (isTHn) {
for (auto& v : hist->FindMember("vars")->value.GetArray()) {

Check failure on line 2519 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
if (VarManager::fgVarNamesMap.find(v.GetString()) == VarManager::fgVarNamesMap.end()) {
LOG(fatal) << "Bad variable in vars (" << v.GetString() << ") specified for histogram";
return false;
Expand Down Expand Up @@ -2576,7 +2579,7 @@

// create an array of strings to store the different histogram classes
std::vector<const char*> histClasses;
for (auto& v : hist.FindMember("histClass")->value.GetArray()) {

Check failure on line 2582 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
histClasses.push_back(v.GetString());
}
const char* title = hist.FindMember("title")->value.GetString();
Expand All @@ -2587,7 +2590,7 @@

int* vars = new int[nDimensions];
int iDim = 0;
for (auto& v : hist.FindMember("vars")->value.GetArray()) {

Check failure on line 2593 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
LOG(debug) << "iDim " << iDim << ": " << v.GetString();
vars[iDim++] = VarManager::fgVarNamesMap[v.GetString()];
}
Expand All @@ -2601,27 +2604,27 @@
xmin = new double[nDimensions];
xmax = new double[nDimensions];
int iDim = 0;
for (auto& v : hist.FindMember("nBins")->value.GetArray()) {

Check failure on line 2607 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
nBins[iDim++] = v.GetInt();
LOG(debug) << "nBins " << iDim << ": " << nBins[iDim - 1];
}
iDim = 0;
for (auto& v : hist.FindMember("xmin")->value.GetArray()) {

Check failure on line 2612 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
xmin[iDim++] = v.GetDouble();
LOG(debug) << "xmin " << iDim << ": " << xmin[iDim - 1];
}
iDim = 0;
for (auto& v : hist.FindMember("xmax")->value.GetArray()) {

Check failure on line 2617 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
xmax[iDim++] = v.GetDouble();
LOG(debug) << "xmax " << iDim << ": " << xmax[iDim - 1];
}
} else {
int iDim = 0;
binLimits = new TArrayD[nDimensions];
for (auto& v : hist.FindMember("binLimits")->value.GetArray()) {

Check failure on line 2624 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
double* lims = new double[v.GetArray().Size()];
int iElem = 0;
for (auto& lim : v.GetArray()) {

Check failure on line 2627 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
lims[iElem++] = lim.GetDouble();
}
binLimits[iDim++] = TArrayD(v.GetArray().Size(), lims);
Expand All @@ -2632,7 +2635,7 @@
if (hist.HasMember("axLabels")) {
axLabels = new TString[hist.FindMember("axLabels")->value.GetArray().Size()];
int iDim = 0;
for (auto& v : hist.FindMember("axLabels")->value.GetArray()) {

Check failure on line 2638 in PWGDQ/Core/HistogramsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
axLabels[iDim++] = v.GetString();
}
}
Expand Down
15 changes: 15 additions & 0 deletions PWGDQ/Core/VarManager.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,8 @@ void VarManager::SetDefaultVarNames()
fgVariableUnits[kPsi2B] = "";
fgVariableNames[kPsi2C] = "#Psi_{2}^{C} ";
fgVariableUnits[kPsi2C] = "";
fgVariableNames[kRandomPsi2] = "Random #Psi_{2} ";
fgVariableUnits[kRandomPsi2] = "";
fgVariableNames[kR2SP_AB] = "R_{2}^{SP} (AB) ";
fgVariableUnits[kR2SP_AB] = "";
fgVariableNames[kR2SP_AC] = "R_{2}^{SP} (AC) ";
Expand Down Expand Up @@ -1521,6 +1523,14 @@ void VarManager::SetDefaultVarNames()
fgVariableUnits[kCosThetaStarFT0A] = "";
fgVariableNames[kCosThetaStarFT0C] = "cos#it{#theta}^{*}_{FT0C}";
fgVariableUnits[kCosThetaStarFT0C] = "";
fgVariableNames[kAbsCosThetaStarFT0C] = "|cos#it{#theta}^{*}_{FT0C}|";
fgVariableUnits[kAbsCosThetaStarFT0C] = "";
fgVariableNames[kCos2ThetaStarFT0C] = "cos^{2}#it{#theta}^{*}_{FT0C}";
fgVariableUnits[kCos2ThetaStarFT0C] = "";
fgVariableNames[kCosThetaStarRandom] = "cos#it{#theta}^{*}_{Random}";
fgVariableUnits[kCosThetaStarRandom] = "";
fgVariableNames[kCos2ThetaStarRandom] = "cos^{2}#it{#theta}^{*}_{Random}";
fgVariableUnits[kCos2ThetaStarRandom] = "";
fgVariableNames[kCosPhiVP] = "cos#it{#varphi}_{VP}";
fgVariableUnits[kCosPhiVP] = "";
fgVariableNames[kPhiVP] = "#varphi_{VP} - #Psi_{2}";
Expand Down Expand Up @@ -2336,6 +2346,10 @@ void VarManager::SetDefaultVarNames()
fgVarNamesMap["kCosThetaStarTPC"] = kCosThetaStarTPC;
fgVarNamesMap["kCosThetaStarFT0A"] = kCosThetaStarFT0A;
fgVarNamesMap["kCosThetaStarFT0C"] = kCosThetaStarFT0C;
fgVarNamesMap["kAbsCosThetaStarFT0C"] = kAbsCosThetaStarFT0C;
fgVarNamesMap["kCos2ThetaStarFT0C"] = kCos2ThetaStarFT0C;
fgVarNamesMap["kCosThetaStarRandom"] = kCosThetaStarRandom;
fgVarNamesMap["kCos2ThetaStarRandom"] = kCos2ThetaStarRandom;
fgVarNamesMap["kCosPhiVP"] = kCosPhiVP;
fgVarNamesMap["kPhiVP"] = kPhiVP;
fgVarNamesMap["kDeltaPhiPair2"] = kDeltaPhiPair2;
Expand Down Expand Up @@ -2434,6 +2448,7 @@ void VarManager::SetDefaultVarNames()
fgVarNamesMap["kPsi2ANEG"] = kPsi2ANEG;
fgVarNamesMap["kPsi2B"] = kPsi2B;
fgVarNamesMap["kPsi2C"] = kPsi2C;
fgVarNamesMap["kRandomPsi2"] = kRandomPsi2;
fgVarNamesMap["kCos2DeltaPhi"] = kCos2DeltaPhi;
fgVarNamesMap["kCos2DeltaPhiMu1"] = kCos2DeltaPhiMu1;
fgVarNamesMap["kCos2DeltaPhiMu2"] = kCos2DeltaPhiMu2;
Expand Down
13 changes: 13 additions & 0 deletions PWGDQ/Core/VarManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,10 @@ class VarManager : public TObject
kCosThetaStarTPC,
kCosThetaStarFT0A,
kCosThetaStarFT0C,
kAbsCosThetaStarFT0C,
kCos2ThetaStarFT0C,
kCosThetaStarRandom,
kCos2ThetaStarRandom,
kCosPhiVP,
kPhiVP,
kDeltaPhiPair2,
Expand Down Expand Up @@ -879,6 +883,7 @@ class VarManager : public TObject
kPsi2ANEG,
kPsi2B,
kPsi2C,
kRandomPsi2,
kCos2DeltaPhi,
kCos2DeltaPhiMu1, // cos(phi - phi1) for muon1
kCos2DeltaPhiMu2, ////cos(phi - phi2) for muon2
Expand Down Expand Up @@ -2193,6 +2198,7 @@ void VarManager::FillEvent(T const& event, float* values)
values[VarManager::kPsi2A] = Psi2A;
values[VarManager::kPsi2B] = Psi2B;
values[VarManager::kPsi2C] = Psi2C;
values[VarManager::kRandomPsi2] = gRandom->Uniform(-o2::constants::math::PIHalf, o2::constants::math::PIHalf);

if constexpr ((fillMap & ReducedEventQvectorExtra) > 0) {
values[kQ42XA] = event.q42xa();
Expand Down Expand Up @@ -5694,6 +5700,13 @@ void VarManager::FillPairVn(T1 const& t1, T2 const& t2, float* values)

ROOT::Math::XYZVector zaxisFT0C = ROOT::Math::XYZVector(TMath::Cos(Psi2C), TMath::Sin(Psi2C), 0).Unit();
values[kCosThetaStarFT0C] = v_CM.Dot(zaxisFT0C);
values[kAbsCosThetaStarFT0C] = std::abs(values[kCosThetaStarFT0C]);
values[kCos2ThetaStarFT0C] = values[kCosThetaStarFT0C] * values[kCosThetaStarFT0C];

// Randomize the event plane angle to check the unpolarized contribution
ROOT::Math::XYZVector zaxisRandom = ROOT::Math::XYZVector(TMath::Cos(values[kRandomPsi2]), TMath::Sin(values[kRandomPsi2]), 0).Unit();
values[kCosThetaStarRandom] = v_CM.Dot(zaxisRandom);
values[kCos2ThetaStarRandom] = values[kCosThetaStarRandom] * values[kCosThetaStarRandom];
}

// kV4, kC4POI, kC4REF etc.
Expand Down
Loading