Skip to content
Closed
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
11 changes: 9 additions & 2 deletions PWGCF/GenericFramework/Core/FlowContainer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

#include "FlowContainer.h"

#include <cstdio>
#include <vector>

ClassImp(FlowContainer);

FlowContainer::FlowContainer() : TNamed("", ""),
Expand Down Expand Up @@ -184,9 +187,9 @@
}
}

Long64_t FlowContainer::Merge(TCollection* collist)

Check failure on line 190 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
{
Long64_t nmerged = 0;

Check failure on line 192 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
FlowContainer* l_FC = 0;
TIter all_FC(collist);
while ((l_FC = dynamic_cast<FlowContainer*>(all_FC()))) {
Expand Down Expand Up @@ -916,8 +919,12 @@
delete tempprof;
}
delete rhSubset;
retpf->RebinX(nBins);
return retpf;
if (retpf) {
retpf->RebinX(nBins);
return retpf;
} else {
return nullptr;
}
};

//{2} particle correlations
Expand All @@ -937,7 +944,7 @@
{
if (cor2 < 0)
return -2;
return TMath::Sqrt(cor2);

Check failure on line 947 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::VN2Error(double cor2, double cor2e)
{
Expand All @@ -945,13 +952,13 @@
return 0;
if (!fPropagateErrors)
return 0;
return 0.5 * cor2e / TMath::Sqrt(cor2);

Check failure on line 955 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::VDN2Value(double cor2d, double cor2)
{
if (cor2 < 0)
return -2;
return cor2d / TMath::Sqrt(cor2);

Check failure on line 961 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::VDN2Error(double cor2d, double cor2de, double cor2, double cor2e)
{
Expand All @@ -960,19 +967,19 @@
double sqrtv = cor2de * cor2de / cor2 + 0.25 * cor2d * cor2d * cor2e * cor2e / (cor2 * cor2 * cor2);
if (sqrtv < 0)
return 0;
return TMath::Sqrt(sqrtv);

Check failure on line 970 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};

// C{4} and V{4} calculations
double FlowContainer::CN4Value(double cor4, double cor2)
{
return cor4 - 2 * TMath::Power(cor2, 2);

Check failure on line 976 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::CN4Error(double cor4e, double cor2, double cor2e)
{
if (!fPropagateErrors)
return 0;
return TMath::Sqrt(cor4e * cor4e + 16 * cor2 * cor2 * cor2e * cor2e);

Check failure on line 982 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::DN4Value(double cor4d, double cor2d, double cor2)
{
Expand All @@ -982,13 +989,13 @@
{
if (!fPropagateErrors)
return 0;
return TMath::Sqrt(cor4de * cor4de + 4 * cor2 * cor2 * cor2de * cor2de + 4 * cor2d * cor2d * cor2e * cor2e);

Check failure on line 992 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::VN4Value(double c4)
{
if (c4 > 0)
return -2;
return TMath::Power(-c4, 1. / 4);

Check failure on line 998 in PWGCF/GenericFramework/Core/FlowContainer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
};
double FlowContainer::VN4Error(double c4, double c4e)
{
Expand Down
Loading