Skip to content

[PWGCF] Please consider the following formatting changes to #8845 #23

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
cnkoster merged 1 commit into from
Dec 6, 2024
Merged

[PWGCF] Please consider the following formatting changes to #8845 #23

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
23 changes: 12 additions & 11 deletions PWGCF/Flow/TableProducer/zdcQVectors.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,22 +472,22 @@ struct ZdcQVectors {
std::vector<int> sparsePars;
THnSparseD* h = reinterpret_cast<THnSparseD*>(hist);
if (step == 0 && iteration > 0) {
//Axis(0) is runnuber, but we don't need this
// Axis(0) is runnuber, but we don't need this
sparsePars.push_back(h->GetAxis(1)->FindBin(centrality));
sparsePars.push_back(h->GetAxis(2)->FindBin(v[0]));
sparsePars.push_back(h->GetAxis(3)->FindBin(v[1]));
sparsePars.push_back(h->GetAxis(4)->FindBin(v[2]));
}
for (std::size_t i = 0; i < sparsePars.size()+1; i++) {
h->GetAxis(i+1)->SetRange(sparsePars[i], sparsePars[i]);

for (std::size_t i = 0; i < sparsePars.size() + 1; i++) {
h->GetAxis(i + 1)->SetRange(sparsePars[i], sparsePars[i]);
}
calibConstant = h->Projection(5)->GetMean();

if (h->Projection(sparsePars.size())->GetEntries() < cfgMinEntriesSparseBin) {
LOGF(debug, "1 entry in sparse bin! Not used... (increase binsize)");
calibConstant = 0;
isSelected = false;
isSelected = false;
}
}
return calibConstant;
Expand All @@ -510,12 +510,12 @@ struct ZdcQVectors {
std::vector<double> xEnZN(2, 0.);
std::vector<double> yEnZN(2, 0.);

isSelected = true;
isSelected = true;

auto cent = collision.centFT0C();

if (cent < 0 || cent > 90) {
isSelected = false;
isSelected = false;
spTableZDC(runnumber, cent, v[0], v[1], v[2], 0, 0, 0, 0, isSelected, 0, 0);
return;
}
Expand All @@ -525,7 +525,7 @@ struct ZdcQVectors {
const auto& foundBC = collision.foundBC_as<BCsRun3>();

if (!foundBC.has_zdc()) {
isSelected = false;
isSelected = false;
spTableZDC(runnumber, cent, v[0], v[1], v[2], 0, 0, 0, 0, isSelected, 0, 0);
return;
}
Expand Down Expand Up @@ -600,14 +600,14 @@ struct ZdcQVectors {
// if ZNA or ZNC not hit correctly.. do not use event in q-vector calculation
if (!isZNAhit || !isZNChit) {
counter++;
isSelected = false;
isSelected = false;
spTableZDC(runnumber, centrality, v[0], v[1], v[2], 0, 0, 0, 0, isSelected, 0, 0);
return;
}

if (!cal.calibfilesLoaded[0][0]) {
counter++;
isSelected = false;
isSelected = false;
spTableZDC(runnumber, centrality, v[0], v[1], v[2], 0, 0, 0, 0, isSelected, 0, 0);
return;
}
Expand Down Expand Up @@ -688,7 +688,8 @@ struct ZdcQVectors {
}
}

if (counter <1) LOGF(info, "We evaluate cal.atIteration=%i and cal.atStep=%i ",cal.atIteration, cal.atStep );
if (counter < 1)
LOGF(info, "We evaluate cal.atIteration=%i and cal.atStep=%i ", cal.atIteration, cal.atStep);

if (cal.atIteration == 0) {
if (counter < 1)
Expand Down
40 changes: 20 additions & 20 deletions PWGCF/Flow/Tasks/flowSP.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,39 +371,39 @@ struct FlowSP {

double v1AC = std::cos(phi - (psiA - psiC));

registry.fill(HIST("v1_eta"), track.eta(),track.pt(), (1. / std::sqrt(2)) * (v1A - v1C));
registry.fill(HIST("v1A_eta"), track.eta(),track.pt(), (v1A));
registry.fill(HIST("v1C_eta"), track.eta(),track.pt(), (v1C));
registry.fill(HIST("v1AC_eta"), track.eta(),track.pt(), (v1AC));
registry.fill(HIST("v1_eta"), track.eta(), track.pt(), (1. / std::sqrt(2)) * (v1A - v1C));
registry.fill(HIST("v1A_eta"), track.eta(), track.pt(), (v1A));
registry.fill(HIST("v1C_eta"), track.eta(), track.pt(), (v1C));
registry.fill(HIST("v1AC_eta"), track.eta(), track.pt(), (v1AC));

registry.fill(HIST("v1_eta_odd"), track.eta(),track.pt(), oddv1);
registry.fill(HIST("v1_eta_even"), track.eta(),track.pt(), evenv1);
registry.fill(HIST("v1_eta_odd"), track.eta(), track.pt(), oddv1);
registry.fill(HIST("v1_eta_even"), track.eta(), track.pt(), evenv1);

registry.fill(HIST("v1_eta_odd_dev"), track.eta(),track.pt(), oddv1Dev);
registry.fill(HIST("v1_eta_even_dev"), track.eta(),track.pt(), evenv1Dev);
registry.fill(HIST("v1_eta_odd_dev"), track.eta(), track.pt(), oddv1Dev);
registry.fill(HIST("v1_eta_even_dev"), track.eta(), track.pt(), evenv1Dev);

if (pos) {
registry.fill(HIST("v1_eta_odd_pos"), track.eta(),track.pt(), oddv1);
registry.fill(HIST("v1_eta_even_pos"), track.eta(),track.pt(), evenv1);
registry.fill(HIST("v1_eta_odd_pos"), track.eta(), track.pt(), oddv1);
registry.fill(HIST("v1_eta_even_pos"), track.eta(), track.pt(), evenv1);

registry.fill(HIST("v1_eta_odd_dev_pos"), track.eta(),track.pt(), oddv1Dev);
registry.fill(HIST("v1_eta_even_dev_pos"), track.eta(),track.pt(), evenv1Dev);
registry.fill(HIST("v1_eta_odd_dev_pos"), track.eta(), track.pt(), oddv1Dev);
registry.fill(HIST("v1_eta_even_dev_pos"), track.eta(), track.pt(), evenv1Dev);
} else {
registry.fill(HIST("v1_eta_odd_neg"), track.eta(),track.pt(), oddv1);
registry.fill(HIST("v1_eta_even_neg"), track.eta(),track.pt(), evenv1);
registry.fill(HIST("v1_eta_odd_neg"), track.eta(), track.pt(), oddv1);
registry.fill(HIST("v1_eta_even_neg"), track.eta(), track.pt(), evenv1);

registry.fill(HIST("v1_eta_odd_dev_neg"), track.eta(),track.pt(), oddv1Dev);
registry.fill(HIST("v1_eta_even_dev_neg"), track.eta(),track.pt(), evenv1Dev);
registry.fill(HIST("v1_eta_odd_dev_neg"), track.eta(), track.pt(), oddv1Dev);
registry.fill(HIST("v1_eta_even_dev_neg"), track.eta(), track.pt(), evenv1Dev);
}

double v2A = std::cos(2 * (phi - psiA));
double v2C = std::cos(2 * (phi - psiC));
double v2AC = std::cos(2 * (phi - (psiA - psiC)));

registry.fill(HIST("v2_cent"), centrality,track.pt(), (1. / std::sqrt(2)) * (v2A - v2C));
registry.fill(HIST("v2A_cent"), centrality,track.pt(), (v2A));
registry.fill(HIST("v2C_cent"), centrality,track.pt(), (v2C));
registry.fill(HIST("v2AC_cent"), centrality,track.pt(), (v2AC));
registry.fill(HIST("v2_cent"), centrality, track.pt(), (1. / std::sqrt(2)) * (v2A - v2C));
registry.fill(HIST("v2A_cent"), centrality, track.pt(), (v2A));
registry.fill(HIST("v2C_cent"), centrality, track.pt(), (v2C));
registry.fill(HIST("v2AC_cent"), centrality, track.pt(), (v2AC));
}

float qIm = collision.qvecIm()[0];
Expand Down
Loading