Skip to content

Commit 26d9dd1

Browse files
EmilGormEmil Gorm Nielsen
EmilGorm
and
Emil Gorm Nielsen
authored
[PWGCF,PWGDQ] Weight merging (#9627)
Co-authored-by: Emil Gorm Nielsen <emilgormnielsen@cern-ch>
1 parent 1db2cd7 commit 26d9dd1

File tree

13 files changed

+381
-282
lines changed

13 files changed

+381
-282
lines changed

‎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/flowGfwTask.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ struct FlowGfwTask {
364364
fPtAxis = new TAxis(nPtBins, ptBins);
365365

366366
if (cfgOutputNUAWeights) {
367-
fWeights->SetPtBins(nPtBins, ptBins);
368-
fWeights->Init(true, false);
367+
fWeights->setPtBins(nPtBins, ptBins);
368+
fWeights->init(true, false);
369369
}
370370

371371
// add in FlowContainer to Get boostrap sample automatically
@@ -509,7 +509,7 @@ struct FlowGfwTask {
509509
return false;
510510
weight_nue = 1. / eff;
511511
if (mAcceptance)
512-
weight_nua = mAcceptance->GetNUA(phi, eta, vtxz);
512+
weight_nua = mAcceptance->getNUA(phi, eta, vtxz);
513513
else
514514
weight_nua = 1;
515515
return true;
@@ -799,7 +799,7 @@ struct FlowGfwTask {
799799
continue;
800800

801801
if (cfgOutputNUAWeights)
802-
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
802+
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
803803

804804
if (!setCurrentParticleWeights(weff, wacc, track.phi(), track.eta(), track.pt(), vtxz))
805805
continue;

‎PWGCF/Flow/Tasks/flowRunbyRun.cxx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,16 +319,23 @@ struct FlowRunbyRun {
319319
LOGF(fatal, "Could not find the weight for run %d", runNumber);
320320
return;
321321
}
322-
weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
322+
weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
323323
}
324324
} else {
325325
GFWWeights* weight = fGFWWeightsList->getGFWWeightsByRun(runNumber);
326326
if (!weight) {
327327
LOGF(fatal, "Could not find the weight for run %d", runNumber);
328328
return;
329329
}
330-
weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
330+
weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
331331
}
332+
} else {
333+
GFWWeights* weight = fGFWWeightsList->getGFWWeightsByRun(runNumber);
334+
if (!weight) {
335+
LOGF(fatal, "Could not find the weight for run %d", runNumber);
336+
return;
337+
}
338+
weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
332339
}
333340
}
334341

‎PWGCF/Flow/Tasks/flowSP.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,14 @@ struct FlowSP {
187187
int ptbins = ptbinning.size() - 1;
188188

189189
if (cfgFillWeights) {
190-
fWeights->SetPtBins(ptbins, &ptbinning[0]);
191-
fWeights->Init(true, false);
190+
fWeights->setPtBins(ptbins, &ptbinning[0]);
191+
fWeights->init(true, false);
192192

193-
fWeightsPOS->SetPtBins(ptbins, &ptbinning[0]);
194-
fWeightsPOS->Init(true, false);
193+
fWeightsPOS->setPtBins(ptbins, &ptbinning[0]);
194+
fWeightsPOS->init(true, false);
195195

196-
fWeightsNEG->SetPtBins(ptbins, &ptbinning[0]);
197-
fWeightsNEG->Init(true, false);
196+
fWeightsNEG->setPtBins(ptbins, &ptbinning[0]);
197+
fWeightsNEG->init(true, false);
198198
}
199199

200200
if ((doprocessData || doprocessMCReco)) {
@@ -413,7 +413,7 @@ struct FlowSP {
413413
weight_nue = 1. / eff;
414414
int sizeAcc = cfg.mAcceptance.size();
415415
if (sizeAcc > pID)
416-
weight_nua = cfg.mAcceptance[pID]->GetNUA(phi, eta, vtxz);
416+
weight_nua = cfg.mAcceptance[pID]->getNUA(phi, eta, vtxz);
417417
else
418418
weight_nua = 1;
419419
return true;
@@ -768,13 +768,13 @@ struct FlowSP {
768768

769769
// Fill NUA weights
770770
if (cfgFillWeights) {
771-
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
771+
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
772772
} else if (cfgFillWeightsPOS) {
773773
if (pos)
774-
fWeightsPOS->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
774+
fWeightsPOS->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
775775
} else if (cfgFillWeightsNEG) {
776776
if (!pos)
777-
fWeightsNEG->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
777+
fWeightsNEG->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
778778
}
779779

780780
// Set weff and wacc for inclusice, negative and positive hadrons

‎PWGCF/Flow/Tasks/flowTask.cxx‎

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

259259
if (cfgOutputNUAWeights) {
260-
fWeights->SetPtBins(nPtBins, ptBins);
261-
fWeights->Init(true, false);
260+
fWeights->setPtBins(nPtBins, ptBins);
261+
fWeights->init(true, false);
262262
}
263263

264264
TList* groupNUAWeightlist = new TList();
@@ -274,8 +274,8 @@ struct FlowTask {
274274
else
275275
groupweight = new GFWWeights(Form("groupweight_last"));
276276

277-
groupweight->SetPtBins(nPtBins, ptBins);
278-
groupweight->Init(true, false);
277+
groupweight->setPtBins(nPtBins, ptBins);
278+
groupweight->init(true, false);
279279
groupNUAWeightlist->Add(groupweight);
280280
std::shared_ptr<GFWWeights> sharePtrGroupWeight(groupweight);
281281
groupNUAWeightPtr[i] = sharePtrGroupWeight;
@@ -534,14 +534,14 @@ struct FlowTask {
534534
weight_nue = 1. / eff;
535535
if (cfgAcceptanceGroupUse) {
536536
if (mGroupAcceptanceList && mGroupAcceptanceList->At(groupNUAIndex)) {
537-
weight_nua = reinterpret_cast<GFWWeights*>(mGroupAcceptanceList->At(groupNUAIndex))->GetNUA(phi, eta, vtxz);
537+
weight_nua = reinterpret_cast<GFWWeights*>(mGroupAcceptanceList->At(groupNUAIndex))->getNUA(phi, eta, vtxz);
538538
} else {
539539
weight_nua = 1;
540540
}
541541
return true;
542542
}
543543
if (mAcceptance)
544-
weight_nua = mAcceptance->GetNUA(phi, eta, vtxz);
544+
weight_nua = mAcceptance->getNUA(phi, eta, vtxz);
545545
else
546546
weight_nua = 1;
547547
return true;
@@ -783,18 +783,18 @@ struct FlowTask {
783783
if (cfgOutputNUAWeights) {
784784
if (cfgOutputNUAWeightsRefPt) {
785785
if (withinPtRef)
786-
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
786+
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
787787
} else {
788-
fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
788+
fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
789789
}
790790
}
791791
if (cfgOutputGroupNUAWeights) {
792792
if (cfgOutputNUAWeightsRefPt) {
793793
if (withinPtRef) {
794-
groupNUAWeightPtr[groupNUAIndex]->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
794+
groupNUAWeightPtr[groupNUAIndex]->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
795795
}
796796
} else {
797-
groupNUAWeightPtr[groupNUAIndex]->Fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
797+
groupNUAWeightPtr[groupNUAIndex]->fill(track.phi(), track.eta(), vtxz, track.pt(), cent, 0);
798798
}
799799
}
800800
if (!setCurrentParticleWeights(weff, wacc, track.phi(), track.eta(), track.pt(), vtxz, groupNUAIndex))

0 commit comments

Comments
 (0)