Skip to content

Commit 490a7ce

Browse files
authored
Rename CorrHistContainer to CorrectionHistContainer
1 parent acb88cd commit 490a7ce

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

PWGCF/Flow/Tasks/flowEventPlane.cxx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#include "Common/DataModel/CollisionAssociationTables.h"
1919
#include "Common/DataModel/EventSelection.h"
2020
#include "Common/DataModel/Multiplicity.h"
21-
#include "Common/DataModel/PIDResponse.h"
21+
#include "Common/DataModel/PIDResponseTOF.h"
22+
#include "Common/DataModel/PIDResponseTPC.h"
2223
#include "Common/DataModel/TrackSelectionTables.h"
2324

2425
#include "CCDB/BasicCCDBManager.h"
@@ -140,11 +141,11 @@ struct FlowEventPlane {
140141
std::map<CorrectionType, std::vector<std::vector<std::string>>> corrTypeHistNameMap = {{kFineCorr, vFineCorrHistNames}, {kCoarseCorr, vCoarseCorrHistNames}};
141142

142143
// Container for histograms
143-
struct CorrHistContainer {
144+
struct CorrectionHistContainer {
144145
TH2F* hGainCalib;
145146
std::array<std::array<THnSparseF*, 1>, 4> vCoarseCorrHist;
146147
std::array<std::array<TProfile*, 4>, 4> vFineCorrHist;
147-
} CorrHistContainer;
148+
} CorrectionHistContainer;
148149

149150
// Run number
150151
int cRunNum = 0, lRunNum = 0;
@@ -336,12 +337,12 @@ struct FlowEventPlane {
336337
auto ccdbObj = ccdbService->getForTimeStamp<TList>(ccdbPath, -1);
337338

338339
// Store histogram in container
339-
CorrHistContainer.hGainCalib = reinterpret_cast<TH2F*>(ccdbObj->FindObject(histName));
340+
CorrectionHistContainer.hGainCalib = reinterpret_cast<TH2F*>(ccdbObj->FindObject(histName));
340341
}
341342

342343
float v = 0.;
343344
for (int i = 0; i < static_cast<int>(energy.size()); ++i) {
344-
v = CorrHistContainer.hGainCalib->GetBinContent(CorrHistContainer.hGainCalib->FindBin(i + 0.5, vz + 0.00001));
345+
v = CorrectionHistContainer.hGainCalib->GetBinContent(CorrectionHistContainer.hGainCalib->FindBin(i + 0.5, vz + 0.00001));
345346
energy[i] *= v;
346347
}
347348
}
@@ -352,7 +353,7 @@ struct FlowEventPlane {
352353
int binarray[4];
353354
if (corrType == kCoarseCorr) {
354355
int cntrx = 0;
355-
for (auto const& v : CorrHistContainer.vCoarseCorrHist) {
356+
for (auto const& v : CorrectionHistContainer.vCoarseCorrHist) {
356357
for (auto const& h : v) {
357358
binarray[kCent] = h->GetAxis(kCent)->FindBin(vCollParam[kCent] + 0.0001);
358359
binarray[kVx] = h->GetAxis(kVx)->FindBin(vCollParam[kVx] + 0.0001);
@@ -364,7 +365,7 @@ struct FlowEventPlane {
364365
}
365366
} else {
366367
int cntrx = 0;
367-
for (auto const& v : CorrHistContainer.vFineCorrHist) {
368+
for (auto const& v : CorrectionHistContainer.vFineCorrHist) {
368369
int cntry = 0;
369370
for (auto const& h : v) {
370371
vAvgOutput[cntrx] += h->GetBinContent(h->GetXaxis()->FindBin(vCollParam[cntry] + 0.0001));
@@ -418,9 +419,9 @@ struct FlowEventPlane {
418419
int cntry = 0;
419420
for (auto const& y : x) {
420421
if (corrType == kFineCorr) {
421-
CorrHistContainer.vFineCorrHist[cntrx][cntry] = reinterpret_cast<TProfile*>(ccdbObject->FindObject(y.c_str()));
422+
CorrectionHistContainer.vFineCorrHist[cntrx][cntry] = reinterpret_cast<TProfile*>(ccdbObject->FindObject(y.c_str()));
422423
} else {
423-
CorrHistContainer.vCoarseCorrHist[cntrx][cntry] = reinterpret_cast<THnSparseF*>(ccdbObject->FindObject(y.c_str()));
424+
CorrectionHistContainer.vCoarseCorrHist[cntrx][cntry] = reinterpret_cast<THnSparseF*>(ccdbObject->FindObject(y.c_str()));
424425
}
425426
++cntry;
426427
}

0 commit comments

Comments
 (0)