Skip to content

Commit a04d468

Browse files
EmilGormEmil Gorm Nielsenalibuild
authored
[PWGCF] Fixed merge and streamer bugs in FlowPtContainer (#9199)
Co-authored-by: Emil Gorm Nielsen <emilgormnielsen@cern-ch> Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent e1875e6 commit a04d468

File tree

4 files changed

+528
-500
lines changed

4 files changed

+528
-500
lines changed

PWGCF/Flow/Tasks/flowAnalysisGF.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ struct flowAnalysisGF {
286286
fFC->Initialize(oba, multAxis, cfgNbootstrap);
287287

288288
delete oba;
289-
fFCpt->Initialise(multAxis, cfgMpar, configs, cfgNbootstrap);
289+
fFCpt->initialise(multAxis, cfgMpar, configs, cfgNbootstrap);
290290

291291
// Event selection - Alex
292292
if (cfgUseAdditionalEventCut) {
@@ -497,9 +497,9 @@ struct flowAnalysisGF {
497497

498498
void FillOutputContainers(datatype dt, const float& centmult, const double& rndm)
499499
{
500-
fFCpt->CalculateCorrelations();
501-
fFCpt->FillPtProfiles(centmult, rndm);
502-
fFCpt->FillCMProfiles(centmult, rndm);
500+
fFCpt->calculateCorrelations();
501+
fFCpt->fillPtProfiles(centmult, rndm);
502+
fFCpt->fillCMProfiles(centmult, rndm);
503503
for (uint l_ind = 0; l_ind < corrconfigs.size(); ++l_ind) {
504504
auto dnx = fGFW->Calculate(corrconfigs.at(l_ind), 0, kTRUE).real();
505505
if (dnx == 0)
@@ -508,7 +508,7 @@ struct flowAnalysisGF {
508508
auto val = fGFW->Calculate(corrconfigs.at(l_ind), 0, kFALSE).real() / dnx;
509509
if (TMath::Abs(val) < 1) {
510510
(dt == kGen) ? fFC_gen->FillProfile(corrconfigs.at(l_ind).Head.c_str(), centmult, val, dnx, rndm) : fFC->FillProfile(corrconfigs.at(l_ind).Head.c_str(), centmult, val, dnx, rndm);
511-
fFCpt->FillVnPtProfiles(centmult, val, dnx, rndm, configs.GetpTCorrMasks()[l_ind]);
511+
fFCpt->fillVnPtProfiles(centmult, val, dnx, rndm, configs.GetpTCorrMasks()[l_ind]);
512512
}
513513
continue;
514514
}
@@ -535,7 +535,7 @@ struct flowAnalysisGF {
535535
registry.fill(HIST("hEventCount"), 9.5);
536536
float vtxz = collision.posZ();
537537
fGFW->Clear();
538-
fFCpt->ClearVector();
538+
fFCpt->clearVector();
539539
float l_Random = fRndm->Rndm();
540540

541541
std::vector<int> ITS_TPC_tracks(6, 0);
@@ -630,7 +630,7 @@ struct flowAnalysisGF {
630630
template <typename TrackObject>
631631
inline void FillGFW(TrackObject track, float weff, float wacc)
632632
{
633-
fFCpt->Fill(weff, track.pt());
633+
fFCpt->fill(weff, track.pt());
634634
bool WithinPtPOI = (ptpoilow < track.pt()) && (track.pt() < ptpoiup); // within POI pT range
635635
bool WithinPtRef = (ptreflow < track.pt()) && (track.pt() < ptrefup); // within RF pT range
636636
if (WithinPtRef)

0 commit comments

Comments
 (0)