Skip to content

Commit 0c14eb4

Browse files
BongHwialibuild
andauthored
[PWG-LF] Replace the binning definition to the process (#3544)
* Replace the binning definition to the process * Please consider the following formatting changes * Use strict definition on SameKindPair --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent d1927c5 commit 0c14eb4

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

PWGLF/Tasks/k1analysis.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,10 @@ struct k1analysis {
507507

508508
// Processing Event Mixing
509509
using BinningTypeVtxZT0M = ColumnBinningPolicy<aod::collision::PosZ, aod::resocollision::MultV0M>;
510-
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
511-
512510
void processME(o2::aod::ResoCollisions& collisions, aod::ResoTracks const& resotracks)
513511
{
514512
auto tracksTuple = std::make_tuple(resotracks);
513+
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
515514
SameKindPair<aod::ResoCollisions, aod::ResoTracks, BinningTypeVtxZT0M> pairs{colBinning, nEvtMixing, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip
516515

517516
for (auto& [collision1, tracks1, collision2, tracks2] : pairs) {

PWGLF/Tasks/k892analysis.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct k892analysis {
4141
/// Histograms
4242
ConfigurableAxis binsPt{"binsPt", {VARIABLE_WIDTH, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 6.9, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 8.6, 8.7, 8.8, 8.9, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6, 9.7, 9.8, 9.9, 10.0, 10.1, 10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, 12.1, 12.2, 12.3, 12.4, 12.5, 12.6, 12.7, 12.8, 12.9, 13.0, 13.1, 13.2, 13.3, 13.4, 13.5, 13.6, 13.7, 13.8, 13.9, 14.0, 14.1, 14.2, 14.3, 14.4, 14.5, 14.6, 14.7, 14.8, 14.9, 15.0}, "Binning of the pT axis"};
4343
ConfigurableAxis binsPtQA{"binsPtQA", {VARIABLE_WIDTH, 0.0, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4, 2.6, 2.8, 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6, 5.8, 6.0, 6.2, 6.4, 6.6, 6.8, 7.0, 7.2, 7.4, 7.6, 7.8, 8.0, 8.2, 8.4, 8.6, 8.8, 9.0, 9.2, 9.4, 9.6, 9.8, 10.0}, "Binning of the pT axis"};
44-
ConfigurableAxis binsCent{"binsCent", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 105.}, "Binning of the centrality axis"};
44+
ConfigurableAxis binsCent{"binsCent", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 110.}, "Binning of the centrality axis"};
4545
Configurable<float> cInvMassStart{"cInvMassStart", 0.6, "Invariant mass start"};
4646
Configurable<float> cInvMassEnd{"cInvMassEnd", 1.5, "Invariant mass end"};
4747
Configurable<int> cInvMassBins{"cInvMassBins", 900, "Invariant mass binning"};
@@ -51,7 +51,7 @@ struct k892analysis {
5151
/// Event Mixing
5252
Configurable<int> nEvtMixing{"nEvtMixing", 5, "Number of events to mix"};
5353
ConfigurableAxis CfgVtxBins{"CfgVtxBins", {VARIABLE_WIDTH, -10.0f, -8.f, -6.f, -4.f, -2.f, 0.f, 2.f, 4.f, 6.f, 8.f, 10.f}, "Mixing bins - z-vertex"};
54-
ConfigurableAxis CfgMultBins{"CfgMultBins", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 105.}, "Mixing bins - multiplicity"};
54+
ConfigurableAxis CfgMultBins{"CfgMultBins", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 110.}, "Mixing bins - multiplicity"};
5555
/// Pre-selection cuts
5656
Configurable<double> cMinPtcut{"cMinPtcut", 0.15, "Track minium pt cut"};
5757
/// DCA Selections
@@ -362,10 +362,10 @@ struct k892analysis {
362362

363363
// Processing Event Mixing
364364
using BinningTypeVtxZT0M = ColumnBinningPolicy<aod::collision::PosZ, aod::resocollision::MultV0M>;
365-
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
366365
void processMELight(o2::aod::ResoCollisions& collisions, aod::ResoTracks const& resotracks)
367366
{
368367
auto tracksTuple = std::make_tuple(resotracks);
368+
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
369369
SameKindPair<aod::ResoCollisions, aod::ResoTracks, BinningTypeVtxZT0M> pairs{colBinning, nEvtMixing, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip
370370

371371
for (auto& [collision1, tracks1, collision2, tracks2] : pairs) {

PWGLF/Tasks/lambda1520_spherocity_analysis.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,13 +435,13 @@ struct lambdaAnalysis {
435435
// Processing Event Mixing
436436
SliceCache cache;
437437
using BinningType = ColumnBinningPolicy<aod::collision::PosZ, aod::resocollision::MultV0M, aod::resocollision::Spherocity>;
438-
BinningType binningPositions{{cfgVtxBins, cfgMultBins, cfgSphBins}, true};
439438

440439
void processMix(resoCols& collisions, resoTracks const& tracks)
441440
{
442441

443442
LOGF(debug, "Event Mixing Started");
444443
auto tracksTuple = std::make_tuple(tracks);
444+
BinningType binningPositions{{cfgVtxBins, cfgMultBins, cfgSphBins}, true};
445445
SameKindPair<resoCols, resoTracks, BinningType> pairs{binningPositions, nMix, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip
446446
for (auto& [c1, t1, c2, t2] : pairs) {
447447
fillDataHistos<true, false>(t1, t2, c1.spherocity(), c1.multV0M());

PWGLF/Tasks/lambda1520analysis.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,10 +567,10 @@ struct lambda1520analysis {
567567

568568
// Processing Event Mixing
569569
using BinningTypeVtxZT0M = ColumnBinningPolicy<aod::collision::PosZ, aod::resocollision::MultV0M>;
570-
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
571570
void processME(o2::aod::ResoCollisions& collisions, aod::ResoTracks const& resotracks)
572571
{
573572
auto tracksTuple = std::make_tuple(resotracks);
573+
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
574574
SameKindPair<aod::ResoCollisions, aod::ResoTracks, BinningTypeVtxZT0M> pairs{colBinning, nEvtMixing, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip
575575

576576
for (auto& [collision1, tracks1, collision2, tracks2] : pairs) {

PWGLF/Tasks/phianalysis.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct phianalysis {
4141
/// Histograms
4242
ConfigurableAxis binsPt{"binsPt", {VARIABLE_WIDTH, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 6.9, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 8.6, 8.7, 8.8, 8.9, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6, 9.7, 9.8, 9.9, 10.0, 10.1, 10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, 12.1, 12.2, 12.3, 12.4, 12.5, 12.6, 12.7, 12.8, 12.9, 13.0, 13.1, 13.2, 13.3, 13.4, 13.5, 13.6, 13.7, 13.8, 13.9, 14.0, 14.1, 14.2, 14.3, 14.4, 14.5, 14.6, 14.7, 14.8, 14.9, 15.0}, "Binning of the pT axis"};
4343
ConfigurableAxis binsPtQA{"binsPtQA", {VARIABLE_WIDTH, 0.0, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4, 2.6, 2.8, 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6, 5.8, 6.0, 6.2, 6.4, 6.6, 6.8, 7.0, 7.2, 7.4, 7.6, 7.8, 8.0, 8.2, 8.4, 8.6, 8.8, 9.0, 9.2, 9.4, 9.6, 9.8, 10.0}, "Binning of the pT axis"};
44-
ConfigurableAxis binsCent{"binsCent", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 105.}, "Binning of the centrality axis"};
44+
ConfigurableAxis binsCent{"binsCent", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 110.}, "Binning of the centrality axis"};
4545
Configurable<float> cInvMassStart{"cInvMassStart", 0.6, "Invariant mass start"};
4646
Configurable<float> cInvMassEnd{"cInvMassEnd", 1.5, "Invariant mass end"};
4747
Configurable<int> cInvMassBins{"cInvMassBins", 900, "Invariant mass binning"};
@@ -51,7 +51,7 @@ struct phianalysis {
5151
/// Event Mixing
5252
Configurable<int> nEvtMixing{"nEvtMixing", 5, "Number of events to mix"};
5353
ConfigurableAxis CfgVtxBins{"CfgVtxBins", {VARIABLE_WIDTH, -10.0f, -8.f, -6.f, -4.f, -2.f, 0.f, 2.f, 4.f, 6.f, 8.f, 10.f}, "Mixing bins - z-vertex"};
54-
ConfigurableAxis CfgMultBins{"CfgMultBins", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 105.}, "Mixing bins - multiplicity"};
54+
ConfigurableAxis CfgMultBins{"CfgMultBins", {VARIABLE_WIDTH, 0., 1., 5., 10., 30., 50., 70., 100., 110.}, "Mixing bins - multiplicity"};
5555
/// Pre-selection cuts
5656
Configurable<double> cMinPtcut{"cMinPtcut", 0.15, "Track minium pt cut"};
5757
/// DCA Selections
@@ -290,10 +290,10 @@ struct phianalysis {
290290

291291
// Processing Event Mixing
292292
using BinningTypeVtxZT0M = ColumnBinningPolicy<aod::collision::PosZ, aod::resocollision::MultV0M>;
293-
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
294293
void processMELight(o2::aod::ResoCollisions& collisions, aod::ResoTracks const& resotracks)
295294
{
296295
auto tracksTuple = std::make_tuple(resotracks);
296+
BinningTypeVtxZT0M colBinning{{CfgVtxBins, CfgMultBins}, true};
297297
SameKindPair<aod::ResoCollisions, aod::ResoTracks, BinningTypeVtxZT0M> pairs{colBinning, nEvtMixing, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip
298298

299299
for (auto& [collision1, tracks1, collision2, tracks2] : pairs) {

PWGLF/Tasks/phianalysisrun3.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,10 @@ struct phianalysisrun3 {
196196
// BinningType binningOnPositions{{axisVertex, axisMultiplicityClass}, true};
197197

198198
using BinningType = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFT0M>;
199-
BinningType binningOnPositions{{axisVertex, axisMultiplicityClass}, true};
200199

201200
// using BinningType = ColumnBinningPolicy<aod::collision::PosZ, aod::mult::MultTPC>;
202201
// BinningType binningOnPositions{{axisVertex, axisMultiplicity}, true};
203202

204-
SameKindPair<EventCandidates, TrackCandidates, BinningType> pair{binningOnPositions, cfgNoMixedEvents, -1, &cache};
205-
206203
void processSameEvent(EventCandidates::iterator const& collision, TrackCandidates const& tracks, aod::BCs const&)
207204
{
208205
if (!collision.sel8()) {
@@ -247,6 +244,9 @@ struct phianalysisrun3 {
247244
PROCESS_SWITCH(phianalysisrun3, processSameEvent, "Process Same event", false);
248245
void processMixedEvent(EventCandidates const& collisions, TrackCandidates const& tracks)
249246
{
247+
auto tracksTuple = std::make_tuple(tracks);
248+
BinningType binningOnPositions{{axisVertex, axisMultiplicityClass}, true};
249+
SameKindPair<EventCandidates, TrackCandidates, BinningType> pair{binningOnPositions, cfgNoMixedEvents, -1, collisions, tracksTuple, &cache};
250250
for (auto& [c1, tracks1, c2, tracks2] : pair) {
251251
if (!c1.sel8()) {
252252
continue;

0 commit comments

Comments
 (0)