Skip to content

[PWGCF] Please consider the following formatting changes to #11763 #22

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

Closed
alibuild wants to merge 1 commit into from
Closed

[PWGCF] Please consider the following formatting changes to #11763 #22

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
1 change: 0 additions & 1 deletion PWGCF/GenericFramework/Core/GFW.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <utility>
#include <vector>


using std::complex;
using std::pair;
using std::string;
Expand Down Expand Up @@ -54,7 +53,7 @@
lOneRegion.BitMask = BitMask; // Bit mask
AddRegion(lOneRegion);
};
void GFW::AddRegion(string refName, vector<int> lNparVec, double lEtaMin, double lEtaMax, int lNpT, int BitMask)

Check failure on line 56 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
{
AddRegion(refName, lEtaMin, lEtaMax, lNpT, BitMask);
(fRegions.end() - 1)->Nhar = static_cast<int>(lNparVec.size());
Expand Down Expand Up @@ -112,7 +111,7 @@
complex<double> formula = part1 * part2 - part3;
return formula;
};
complex<double> GFW::RecursiveCorr(GFWCumulant* qpoi, GFWCumulant* qref, GFWCumulant* qol, int ptbin, vector<int>& hars)

Check failure on line 114 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
{
vector<int> pows;
for (int i = 0; i < static_cast<int>(hars.size()); i++)
Expand All @@ -120,7 +119,7 @@
return RecursiveCorr(qpoi, qref, qol, ptbin, hars, pows);
};

complex<double> GFW::RecursiveCorr(GFWCumulant* qpoi, GFWCumulant* qref, GFWCumulant* qol, int ptbin, vector<int>& hars, vector<int>& pows)

Check failure on line 122 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
{
if ((pows.at(0) != 1) && qol)
qpoi = qol; // if the power of POI is not unity, then always use overlap (if defined).
Expand Down Expand Up @@ -194,8 +193,8 @@
int counter = 0;
while (s_tokenize(config, ts, szend, "{")) {
counter++;
ReturnConfig.Regs.push_back(vector<int>{});

Check failure on line 196 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
ReturnConfig.Hars.push_back(vector<int>{});

Check failure on line 197 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
ReturnConfig.Overlap.push_back(-1); // initially, assume no overlap
// Check if there's a particular pT bin I should be using here. If so, store it (otherwise, it's bin 0)
int ptbin = -1;
Expand Down Expand Up @@ -251,7 +250,7 @@
return ReturnConfig;
};

complex<double> GFW::Calculate(int poi, int ref, vector<int> hars, int ptbin)

Check failure on line 253 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
{
GFWCumulant* qref = &fCumulants.at(ref);
GFWCumulant* qpoi = &fCumulants.at(poi);
Expand Down Expand Up @@ -303,12 +302,12 @@
}
return retval;
};
vector<pair<int, vector<int>>> GFW::GetHarmonicsSingleConfig(const CorrConfig& incfg)

Check failure on line 305 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
{
vector<pair<int, vector<int>>> retPair;

Check failure on line 307 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
for (int iR = 0; iR < static_cast<int>(incfg.Regs.size()); iR++) {
if (static_cast<int>(incfg.Regs[iR].size()) > 1) {
retPair.push_back(make_pair(incfg.Regs[iR][0], vector<int>{incfg.Hars[iR][0]})); // If we have a PoI, then it comes with the first harmonic

Check failure on line 310 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
retPair.push_back(make_pair(incfg.Regs[iR][1], incfg.Hars[iR])); // Then the second is ref. with full harmonics
} else {
retPair.push_back(make_pair(incfg.Regs[iR][0], incfg.Hars[iR])); // Otherwise, it's only ref with all harmonics
Expand All @@ -320,7 +319,7 @@
};
void GFW::InitializePowerArrays()
{
vector<vector<vector<int>>> harSets(static_cast<int>(fRegions.size()));

Check failure on line 322 in PWGCF/GenericFramework/Core/GFW.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
for (const CorrConfig& lConf : fListOfCFGs) {
auto HarPerReg = GetHarmonicsSingleConfig(lConf);
for (auto oneHar : HarPerReg)
Expand Down
Loading