Skip to content

Commit 154eb19

Browse files
author
Emil Gorm Nielsen
committed
Revert "O2 Linter"
This reverts commit 5fb7396.
1 parent 5fb7396 commit 154eb19

File tree

12 files changed

+176
-200
lines changed

12 files changed

+176
-200
lines changed

‎PWGCF/Flow/Tasks/FlowGFWPbPb.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ struct FlowGFWPbPb {
249249
fPtAxis = new TAxis(nPtBins, PtBins);
250250

251251
if (cfgOutputNUAWeights) {
252-
fWeights->setPtBins(nPtBins, PtBins);
253-
fWeights->init(true, false);
252+
fWeights->SetPtBins(nPtBins, PtBins);
253+
fWeights->Init(true, false);
254254
}
255255

256256
// add in FlowContainer to Get boostrap sample automatically
@@ -384,7 +384,7 @@ struct FlowGFWPbPb {
384384
return false;
385385
weight_nue = 1. / eff;
386386
if (mAcceptance)
387-
weight_nua = mAcceptance->getNUA(phi, eta, vtxz);
387+
weight_nua = mAcceptance->GetNUA(phi, eta, vtxz);
388388
else
389389
weight_nua = 1;
390390
return true;
@@ -510,8 +510,8 @@ struct FlowGFWPbPb {
510510
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
511511
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls) && (nabs(aod::track::dcaZ) < cfgCutDCAz) && (nabs(aod::track::dcaXY) < cfgCutDCAxy);
512512

513-
using Colls = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs>>; // collisions filter
514-
using aodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksDCA, aod::TracksExtra>>; // tracks filter
513+
using Colls = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs>>; // collisions filter
514+
using aodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksDCA, aod::TracksExtra>>; // tracks filter
515515

516516
void process(Colls::iterator const& collision, aod::BCsWithTimestamps const&, aodTracks const& tracks)
517517
{
@@ -590,7 +590,7 @@ struct FlowGFWPbPb {
590590
if (cfgUseAdditionalTrackCut && !trackSelected(track, Magnetfield))
591591
continue;
592592
if (cfgOutputNUAWeights)
593-
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
593+
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
594594
if (!setCurrentParticleWeights(weff, wacc, track.phi(), track.eta(), track.pt(), vtxz))
595595
continue;
596596

‎PWGCF/Flow/Tasks/flowAnalysisGF.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ struct flowAnalysisGF {
214214
fPtAxis = new TAxis(ptbins, &ptbinning[0]);
215215

216216
if (cfgFillWeights) {
217-
fWeights->setPtBins(ptbins, &ptbinning[0]);
218-
fWeights->init(true, false);
217+
fWeights->SetPtBins(ptbins, &ptbinning[0]);
218+
fWeights->Init(true, false);
219219
}
220220

221221
if (doprocessMCGen) {
@@ -388,7 +388,7 @@ struct flowAnalysisGF {
388388
return false;
389389
weight_nue = 1. / eff;
390390
if (cfg.mAcceptance)
391-
weight_nua = cfg.mAcceptance->getNUA(phi, eta, vtxz);
391+
weight_nua = cfg.mAcceptance->GetNUA(phi, eta, vtxz);
392392
else
393393
weight_nua = 1;
394394
return true;
@@ -582,7 +582,7 @@ struct flowAnalysisGF {
582582
return false;
583583

584584
if (cfgFillWeights)
585-
fWeights->fill(particle.phi(), particle.eta(), vtxz, particle.pt(), centrality, 0);
585+
fWeights->Fill(particle.phi(), particle.eta(), vtxz, particle.pt(), centrality, 0);
586586

587587
if (!setCurrentParticleWeights(weff, wacc, particle.phi(), particle.eta(), particle.pt(), vtxz))
588588
return false;

‎PWGCF/Flow/Tasks/flowGFWOmegaXi.cxx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -376,16 +376,16 @@ struct FlowGFWOmegaXi {
376376

377377
// fWeight output
378378
if (cfgOutputNUAWeights) {
379-
fWeightsREF->setPtBins(nPtBins, &(axisPt.binEdges)[0]);
380-
fWeightsREF->init(true, false);
381-
fWeightsK0s->setPtBins(nPtBins, &(axisPt.binEdges)[0]);
382-
fWeightsK0s->init(true, false);
383-
fWeightsLambda->setPtBins(nPtBins, &(axisPt.binEdges)[0]);
384-
fWeightsLambda->init(true, false);
385-
fWeightsXi->setPtBins(nPtBins, &(axisPt.binEdges)[0]);
386-
fWeightsXi->init(true, false);
387-
fWeightsOmega->setPtBins(nPtBins, &(axisPt.binEdges)[0]);
388-
fWeightsOmega->init(true, false);
379+
fWeightsREF->SetPtBins(nPtBins, &(axisPt.binEdges)[0]);
380+
fWeightsREF->Init(true, false);
381+
fWeightsK0s->SetPtBins(nPtBins, &(axisPt.binEdges)[0]);
382+
fWeightsK0s->Init(true, false);
383+
fWeightsLambda->SetPtBins(nPtBins, &(axisPt.binEdges)[0]);
384+
fWeightsLambda->Init(true, false);
385+
fWeightsXi->SetPtBins(nPtBins, &(axisPt.binEdges)[0]);
386+
fWeightsXi->Init(true, false);
387+
fWeightsOmega->SetPtBins(nPtBins, &(axisPt.binEdges)[0]);
388+
fWeightsOmega->Init(true, false);
389389
}
390390
}
391391

@@ -565,7 +565,7 @@ struct FlowGFWOmegaXi {
565565
return false;
566566
weight_nue = 1. / eff;
567567
if (mAcceptance.size() == 5)
568-
weight_nua = mAcceptance[ispecies]->getNUA(track.phi(), track.eta(), vtxz);
568+
weight_nua = mAcceptance[ispecies]->GetNUA(track.phi(), track.eta(), vtxz);
569569
else
570570
weight_nua = 1;
571571
return true;
@@ -681,7 +681,7 @@ struct FlowGFWOmegaXi {
681681
fGFW->Fill(track.eta(), ptbin, track.phi(), wacc * weff, 32);
682682
}
683683
if (cfgOutputNUAWeights)
684-
fWeightsREF->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
684+
fWeightsREF->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
685685
}
686686
// fill GFW of V0 flow
687687
for (const auto& v0 : V0s) {
@@ -767,15 +767,15 @@ struct FlowGFWOmegaXi {
767767
registry.fill(HIST("hEtaPhiVtxzPOIK0s"), v0.phi(), v0.eta(), vtxz, wacc);
768768
fGFW->Fill(v0.eta(), fV0PtAxis->FindBin(v0.pt()) - 1 + ((fK0sMass->FindBin(v0.mK0Short()) - 1) * nV0PtBins), v0.phi(), wacc * weff, 8);
769769
if (cfgOutputNUAWeights)
770-
fWeightsK0s->fill(v0.phi(), v0.eta(), vtxz, v0.pt(), cent, 0);
770+
fWeightsK0s->Fill(v0.phi(), v0.eta(), vtxz, v0.pt(), cent, 0);
771771
}
772772
if (isLambda) {
773773
candNum[1] = candNum[1] + 1;
774774
registry.fill(HIST("InvMassLambda"), v0.pt(), v0.mLambda(), v0.eta(), cent);
775775
registry.fill(HIST("hEtaPhiVtxzPOILambda"), v0.phi(), v0.eta(), vtxz, wacc);
776776
fGFW->Fill(v0.eta(), fV0PtAxis->FindBin(v0.pt()) - 1 + ((fLambdaMass->FindBin(v0.mLambda()) - 1) * nV0PtBins), v0.phi(), wacc * weff, 16);
777777
if (cfgOutputNUAWeights)
778-
fWeightsLambda->fill(v0.phi(), v0.eta(), vtxz, v0.pt(), cent, 0);
778+
fWeightsLambda->Fill(v0.phi(), v0.eta(), vtxz, v0.pt(), cent, 0);
779779
}
780780
}
781781
// fill GFW of casc flow
@@ -861,15 +861,15 @@ struct FlowGFWOmegaXi {
861861
registry.fill(HIST("InvMassOmega"), casc.pt(), casc.mOmega(), casc.eta(), cent);
862862
fGFW->Fill(casc.eta(), fXiPtAxis->FindBin(casc.pt()) - 1 + ((fOmegaMass->FindBin(casc.mOmega()) - 1) * nXiPtBins), casc.phi(), wacc * weff, 4);
863863
if (cfgOutputNUAWeights)
864-
fWeightsOmega->fill(casc.phi(), casc.eta(), vtxz, casc.pt(), cent, 0);
864+
fWeightsOmega->Fill(casc.phi(), casc.eta(), vtxz, casc.pt(), cent, 0);
865865
}
866866
if (isXi) {
867867
candNum[2] = candNum[2] + 1;
868868
registry.fill(HIST("hEtaPhiVtxzPOIXi"), casc.phi(), casc.eta(), vtxz, wacc);
869869
registry.fill(HIST("InvMassXi"), casc.pt(), casc.mXi(), casc.eta(), cent);
870870
fGFW->Fill(casc.eta(), fXiPtAxis->FindBin(casc.pt()) - 1 + ((fXiMass->FindBin(casc.mXi()) - 1) * nXiPtBins), casc.phi(), wacc * weff, 2);
871871
if (cfgOutputNUAWeights)
872-
fWeightsXi->fill(casc.phi(), casc.eta(), vtxz, casc.pt(), cent, 0);
872+
fWeightsXi->Fill(casc.phi(), casc.eta(), vtxz, casc.pt(), cent, 0);
873873
}
874874
}
875875
for (int i = 0; i < 4; i++) {

‎PWGCF/Flow/Tasks/flowRunbyRun.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ struct FlowRunbyRun {
278278
LOGF(fatal, "Could not find the weight for run %d", runNumber);
279279
return;
280280
}
281-
weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
281+
weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
282282
}
283283
} else {
284284
GFWWeights* weight = fGFWWeightsList->getGFWWeightsByRun(runNumber);
285285
if (!weight) {
286286
LOGF(fatal, "Could not find the weight for run %d", runNumber);
287287
return;
288288
}
289-
weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
289+
weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
290290
}
291291
}
292292

‎PWGCF/Flow/Tasks/flowTask.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ struct FlowTask {
254254
fPtAxis = new TAxis(nPtBins, ptBins);
255255

256256
if (cfgOutputNUAWeights) {
257-
fWeights->setPtBins(nPtBins, ptBins);
258-
fWeights->init(true, false);
257+
fWeights->SetPtBins(nPtBins, ptBins);
258+
fWeights->Init(true, false);
259259
}
260260

261261
TList* groupNUAWeightlist = new TList();
@@ -271,8 +271,8 @@ struct FlowTask {
271271
else
272272
groupweight = new GFWWeights(Form("groupweight_last"));
273273

274-
groupweight->setPtBins(nPtBins, ptBins);
275-
groupweight->init(true, false);
274+
groupweight->SetPtBins(nPtBins, ptBins);
275+
groupweight->Init(true, false);
276276
groupNUAWeightlist->Add(groupweight);
277277
std::shared_ptr<GFWWeights> sharePtrGroupWeight(groupweight);
278278
groupNUAWeightPtr[i] = sharePtrGroupWeight;
@@ -566,14 +566,14 @@ struct FlowTask {
566566
weight_nue = 1. / eff;
567567
if (cfgAcceptanceGroupUse) {
568568
if (mGroupAcceptanceList && mGroupAcceptanceList->At(groupNUAIndex)) {
569-
weight_nua = reinterpret_cast<GFWWeights*>(mGroupAcceptanceList->At(groupNUAIndex))->getNUA(phi, eta, vtxz);
569+
weight_nua = reinterpret_cast<GFWWeights*>(mGroupAcceptanceList->At(groupNUAIndex))->GetNUA(phi, eta, vtxz);
570570
} else {
571571
weight_nua = 1;
572572
}
573573
return true;
574574
}
575575
if (mAcceptance)
576-
weight_nua = mAcceptance->getNUA(phi, eta, vtxz);
576+
weight_nua = mAcceptance->GetNUA(phi, eta, vtxz);
577577
else
578578
weight_nua = 1;
579579
return true;
@@ -790,18 +790,18 @@ struct FlowTask {
790790
if (cfgOutputNUAWeights) {
791791
if (cfgOutputNUAWeightsRefPt) {
792792
if (withinPtRef)
793-
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
793+
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
794794
} else {
795-
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
795+
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
796796
}
797797
}
798798
if (cfgOutputGroupNUAWeights) {
799799
if (cfgOutputNUAWeightsRefPt) {
800800
if (withinPtRef) {
801-
groupNUAWeightPtr[groupNUAIndex]->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
801+
groupNUAWeightPtr[groupNUAIndex]->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
802802
}
803803
} else {
804-
groupNUAWeightPtr[groupNUAIndex]->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
804+
groupNUAWeightPtr[groupNUAIndex]->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
805805
}
806806
}
807807
if (!setCurrentParticleWeights(weff, wacc, track.phi(), track.eta(), track.pt(), vtxz, groupNUAIndex))

0 commit comments

Comments
 (0)