Skip to content

PWGDQ: fix error exception on vector when running on different datasets #1352

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

Merged
iarsene merged 6 commits into from
Oct 12, 2022
Merged

PWGDQ: fix error exception on vector when running on different datasets #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56df233
fix error exception when accessing GFWCumulant vector
robincaron13 Oct 10, 2022
81eeef4
fix: no fill of QA histos if no tracks
robincaron13 Oct 12, 2022
c69f03e
format
robincaron13 Oct 12, 2022
fd4e6d5
format again
robincaron13 Oct 12, 2022
7dcb9d5
try format again
robincaron13 Oct 12, 2022
fd9ae5d
remove empty spaces
robincaron13 Oct 12, 2022
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
16 changes: 12 additions & 4 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,12 @@ void VarManager::FillEvent(T const& event, float* values)
values[kQ3Y0C] = event.q3y0c();
values[kR2SP] = (event.q2x0b() * event.q2x0c() + event.q2y0b() * event.q2y0c());
values[kR3SP] = (event.q3x0b() * event.q3x0c() + event.q3y0b() * event.q3y0c());
values[kR2EP] = TMath::Cos(2 * (getEventPlane(2, event.q2x0b(), event.q2y0b()) - getEventPlane(2, event.q2x0c(), event.q2y0c())));
values[kR3EP] = TMath::Cos(3 * (getEventPlane(3, event.q3x0b(), event.q3y0b()) - getEventPlane(3, event.q3x0c(), event.q3y0c())));
if (event.q2y0b() * event.q2y0c() != 0.0) {
values[kR2EP] = TMath::Cos(2 * (getEventPlane(2, event.q2x0b(), event.q2y0b()) - getEventPlane(2, event.q2x0c(), event.q2y0c())));
}
if (event.q3y0b() * event.q3y0c() != 0.0) {
values[kR3EP] = TMath::Cos(3 * (getEventPlane(3, event.q3x0b(), event.q3y0b()) - getEventPlane(3, event.q3x0c(), event.q3y0c())));
}
}

if constexpr ((fillMap & CollisionMC) > 0) {
Expand Down Expand Up @@ -1299,8 +1303,12 @@ void VarManager::FillQVectorFromGFW(C const& collision, A const& compA2, A const
auto Psi3C = getEventPlane(3, values[kQ3X0C], values[kQ3Y0C]);
values[kR2SP] = (values[kQ2X0B] * values[kQ2X0C] + values[kQ2Y0B] * values[kQ2Y0C]);
values[kR3SP] = (values[kQ3X0B] * values[kQ3X0C] + values[kQ3Y0B] * values[kQ3Y0C]);
values[kR2EP] = TMath::Cos(2 * (Psi2B - Psi2C));
values[kR3EP] = TMath::Cos(3 * (Psi3B - Psi3C));
if (values[kQ2Y0B] * values[kQ2Y0C] != 0.0) {
values[kR2EP] = TMath::Cos(2 * (Psi2B - Psi2C));
}
if (values[kQ3Y0B] * values[kQ3Y0C] != 0.0) {
values[kR3EP] = TMath::Cos(3 * (Psi3B - Psi3C));
}
}

template <int pairType, typename T1, typename T2>
Expand Down
48 changes: 30 additions & 18 deletions PWGDQ/Tasks/dqFlow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,29 +289,41 @@ struct AnalysisQvector {
// FillFC(corrconfigs.at(l_ind), collision.centRun2V0M(), l_Random, fillFlag, DQEventFlag);
// };

// Obtain the GFWCumulant where Q is calculated (index=region, with different eta gaps)
GFWCumulant gfwCumN = fGFW->GetCumulant(0);
GFWCumulant gfwCumP = fGFW->GetCumulant(1);
GFWCumulant gfwCumFull = fGFW->GetCumulant(2);

// Get the multiplicity of the event in this region
int nentriesN = gfwCumN.GetN();
int nentriesP = gfwCumP.GetN();
int nentriesFull = gfwCumFull.GetN();

// Get the Q vector for selected harmonic, power (for minPt=0)
TComplex Q2vecN = gfwCumN.Vec(2, fConfigNPow);
TComplex Q2vecP = gfwCumP.Vec(2, fConfigNPow);
TComplex Q2vecFull = gfwCumFull.Vec(2, fConfigNPow);
TComplex Q3vecN = gfwCumN.Vec(3, fConfigNPow);
TComplex Q3vecP = gfwCumP.Vec(3, fConfigNPow);
TComplex Q3vecFull = gfwCumFull.Vec(3, fConfigNPow);
int nentriesN = 0.0;
int nentriesP = 0.0;
int nentriesFull = 0.0;
TComplex Q2vecN;
TComplex Q2vecP;
TComplex Q2vecFull;
TComplex Q3vecN;
TComplex Q3vecP;
TComplex Q3vecFull;

if (fGFW && (tracks1.size() > 0)) {
// Obtain the GFWCumulant where Q is calculated (index=region, with different eta gaps)
GFWCumulant gfwCumN = fGFW->GetCumulant(0);
GFWCumulant gfwCumP = fGFW->GetCumulant(1);
GFWCumulant gfwCumFull = fGFW->GetCumulant(2);

// and the multiplicity of the event in each region
nentriesN = gfwCumN.GetN();
nentriesP = gfwCumP.GetN();
nentriesFull = gfwCumFull.GetN();

// Get the Q vector for selected harmonic, power (for minPt=0)
Q2vecN = gfwCumN.Vec(2, fConfigNPow);
Q2vecP = gfwCumP.Vec(2, fConfigNPow);
Q2vecFull = gfwCumFull.Vec(2, fConfigNPow);
Q3vecN = gfwCumN.Vec(3, fConfigNPow);
Q3vecP = gfwCumP.Vec(3, fConfigNPow);
Q3vecFull = gfwCumFull.Vec(3, fConfigNPow);
}

// Fill the VarManager::fgValues with the Q vector quantities
VarManager::FillQVectorFromGFW(collision, Q2vecFull, Q2vecN, Q2vecP, Q3vecFull, Q3vecN, Q3vecP, nentriesFull, nentriesN, nentriesP);

if (fConfigQA) {
if (nentriesN * nentriesP * nentriesFull != 0) {
if ((tracks1.size() > 0) && (nentriesFull * nentriesN * nentriesP != 0.0)) {
fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues);
if (fEventCut->IsSelected(VarManager::fgValues)) {
fHistMan->FillHistClass("Event_AfterCuts", VarManager::fgValues);
Expand Down