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
2 changes: 1 addition & 1 deletion Common/DataModel/Qvectors.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ DECLARE_SOA_TABLE(Qvectors, "AOD", "QVECTORDEVS", //! Table with all Qvectors.
using Qvector = Qvectors::iterator;
DECLARE_SOA_TABLE(QvectorsShifteds, "AOD", "QVECTORSCDEVS", //! Table with all shifted Qvectors.
qvec::Cent, qvec::IsCalibrated, qvec::QvecShiftedRe, qvec::QvecShiftedIm, qvec::QvecAmp);
using QvectorShifted = QvectorsShifteds::iterator;
using QvectorShifted = QvectorsShifteds::iterator;

DECLARE_SOA_TABLE(QvectorFT0Cs, "AOD", "QVECTORSFT0C", qvec::IsCalibrated, qvec::QvecFT0CRe, qvec::QvecFT0CIm, qvec::SumAmplFT0C);
DECLARE_SOA_TABLE(QvectorFT0As, "AOD", "QVECTORSFT0A", qvec::IsCalibrated, qvec::QvecFT0ARe, qvec::QvecFT0AIm, qvec::SumAmplFT0A);
Expand Down
6 changes: 3 additions & 3 deletions Common/Tasks/qVectorsCorrection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@
histosQA.fill(HIST("histEvtPlFinalV2"), helperEP.GetEventPlane(vec.qvecRe()[DetInd + 3], vec.qvecIm()[DetInd + 3], nmode), vec.cent());
if (cfgShiftCor) {
for (int ishift = 1; ishift <= 10; ishift++) {
histosQA.fill(HIST("histShiftFITV2"), vec.cent(), DetId * 2, ishift - 0.5, TMath::Sin(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[DetInd + 3], vec.qvecRe()[DetInd + 3]) / static_cast<float>(nmode)));

Check failure on line 444 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
histosQA.fill(HIST("histShiftFITV2"), vec.cent(), DetId * 2 + 1, ishift - 0.5, TMath::Cos(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[DetInd + 3], vec.qvecRe()[DetInd + 3]) / static_cast<float>(nmode)));

Check failure on line 445 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
}
}
if (cfgQAOccupancyStudy) {
Expand All @@ -468,8 +468,8 @@
histosQA.fill(HIST("histEvtPlRefAFinalV2"), helperEP.GetEventPlane(vec.qvecRe()[RefAInd + 3], vec.qvecIm()[RefAInd + 3], nmode), vec.cent());
if (cfgShiftCor) {
for (int ishift = 1; ishift <= 10; ishift++) {
histosQA.fill(HIST("histShiftFITV2"), vec.cent(), RefAId * 2, ishift - 0.5, TMath::Sin(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[RefAInd + 3], vec.qvecRe()[RefAInd + 3]) / static_cast<float>(nmode)));

Check failure on line 471 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
histosQA.fill(HIST("histShiftFITV2"), vec.cent(), RefAId * 2 + 1, ishift - 0.5, TMath::Cos(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[RefAInd + 3], vec.qvecRe()[RefAInd + 3]) / static_cast<float>(nmode)));

Check failure on line 472 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
}
}
if (cfgQAOccupancyStudy) {
Expand All @@ -495,8 +495,8 @@
histosQA.fill(HIST("histEvtPlRefBFinalV2"), helperEP.GetEventPlane(vec.qvecRe()[RefBInd + 3], vec.qvecIm()[RefBInd + 3], nmode), vec.cent());
if (cfgShiftCor) {
for (int ishift = 1; ishift <= 10; ishift++) {
histosQA.fill(HIST("histShiftFITV2"), vec.cent(), RefBId * 2, ishift - 0.5, TMath::Sin(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[RefBInd + 3], vec.qvecRe()[RefBInd + 3]) / static_cast<float>(nmode)));

Check failure on line 498 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
histosQA.fill(HIST("histShiftFITV2"), vec.cent(), RefBId * 2 + 1, ishift - 0.5, TMath::Cos(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[RefBInd + 3], vec.qvecRe()[RefBInd + 3]) / static_cast<float>(nmode)));

Check failure on line 499 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
}
}
if (cfgQAOccupancyStudy) {
Expand Down Expand Up @@ -533,8 +533,8 @@
}
if (cfgShiftCor) {
for (int ishift = 1; ishift <= 10; ishift++) {
histosQA.fill(HIST("histShiftFITV3"), vec.cent(), DetId * 2, ishift - 0.5, TMath::Sin(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[DetInd + 3], vec.qvecRe()[DetInd + 3]) / static_cast<float>(nmode)));

Check failure on line 536 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
histosQA.fill(HIST("histShiftFITV3"), vec.cent(), DetId * 2 + 1, ishift - 0.5, TMath::Cos(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[DetInd + 3], vec.qvecRe()[DetInd + 3]) / static_cast<float>(nmode)));

Check failure on line 537 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
}
}
histosQA.fill(HIST("histQvecFinalV3"), vec.qvecRe()[DetInd + 3], vec.qvecIm()[DetInd + 3], vec.cent());
Expand All @@ -559,8 +559,8 @@
histosQA.fill(HIST("histEvtPlRefAFinalV3"), helperEP.GetEventPlane(vec.qvecRe()[RefAInd + 3], vec.qvecIm()[RefAInd + 3], nmode), vec.cent());
if (cfgShiftCor) {
for (int ishift = 1; ishift <= 10; ishift++) {
histosQA.fill(HIST("histShiftFITV3"), vec.cent(), RefAId * 2, ishift - 0.5, TMath::Sin(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[RefAInd + 3], vec.qvecRe()[RefAInd + 3]) / static_cast<float>(nmode)));

Check failure on line 562 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
histosQA.fill(HIST("histShiftFITV3"), vec.cent(), RefAId * 2 + 1, ishift - 0.5, TMath::Cos(ishift * static_cast<float>(nmode) * TMath::ATan2(vec.qvecIm()[RefAInd + 3], vec.qvecRe()[RefAInd + 3]) / static_cast<float>(nmode)));

Check failure on line 563 in Common/Tasks/qVectorsCorrection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity]

Replace ROOT entities with equivalents from standard C++ or from O2.
}
}
if (cfgQAOccupancyStudy) {
Expand Down Expand Up @@ -740,7 +740,7 @@
fillHistosFlow(qVec, tracks, cfgnMods->at(i));
}
}
}
}
PROCESS_SWITCH(qVectorsCorrection, process, "default process", true);

void processWithSC(MyCollisionsWithSC::iterator const& qVec, MyTracks const& tracks)
Expand All @@ -750,7 +750,7 @@
!qVec.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) ||
!qVec.selection_bit(aod::evsel::kNoSameBunchPileup))) {
return;
}
}
if (cfgAddEvtSel && (qVec.trackOccupancyInTimeRange() > cfgMaxOccupancy || qVec.trackOccupancyInTimeRange() < cfgMinOccupancy)) {
return;
}
Expand All @@ -759,7 +759,7 @@
}

for (uint i = 0; i < cfgnMods->size(); i++) {
fillHistosQvecWithSC(qVec, cfgnMods->at(i));
fillHistosQvecWithSC(qVec, cfgnMods->at(i));
if (cfgQAFlowStudy) {
fillHistosFlowWithSC(qVec, tracks, cfgnMods->at(i));
}
Expand Down
Loading