Skip to content

Commit 02ceaa2

Browse files
committed
[PWGCF,PWGLF] Drop the redundant ignore-overflows argument from binning policies
The trailing true passed to ColumnBinningPolicy and FlexibleBinningPolicy is the constructor's own default, so removing it changes nothing here. It matters because O2 is dropping that parameter: the policies always map values outside the outermost axis edges to bin -1 now, and selecting the alternative per instance is going away. Nothing in O2Physics ever passed false, but twelve sites spelled the default out and would stop compiling, since these are braced initialisations against a user-declared constructor with no aggregate-init fallback. Removing the argument first lets the tasks build against O2 both before and after that change. In twoParticleCorrelationsMpi the comment explaining the argument goes with it, keeping only the part that stays true: out-of-range collisions get bin -1.
1 parent 6178aee commit 02ceaa2

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎PWGCF/TwoParticleCorrelations/Tasks/hParticleCorrelation.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,10 +1730,10 @@ struct HParticleCorrelation2SameEvent {
17301730
using BinningTypeVtxZFT0A = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFT0A>;
17311731
using BinningTypeVtxZFV0A = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFV0A>;
17321732

1733-
BinningTypeVtxZFT0C colBinningFT0C{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}, true};
1734-
BinningTypeVtxZFT0M colBinningFT0M{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}, true};
1735-
BinningTypeVtxZFT0A colBinningFT0A{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}, true};
1736-
BinningTypeVtxZFV0A colBinningFV0A{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}, true};
1733+
BinningTypeVtxZFT0C colBinningFT0C{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}};
1734+
BinningTypeVtxZFT0M colBinningFT0M{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}};
1735+
BinningTypeVtxZFT0A colBinningFT0A{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}};
1736+
BinningTypeVtxZFV0A colBinningFV0A{{cfgMixing.c1138axisVtxMixing, cfgMixing.c1139axisCentMixing}};
17371737

17381738
int nMixBins = 0;
17391739

@@ -4076,10 +4076,10 @@ struct HParticleCorrelation3MixedEvent {
40764076
using BinningTypeVtxZFT0A = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFT0A>;
40774077
using BinningTypeVtxZFV0A = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFV0A>;
40784078

4079-
BinningTypeVtxZFT0C colBinningFT0C{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}, true};
4080-
BinningTypeVtxZFT0M colBinningFT0M{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}, true};
4081-
BinningTypeVtxZFT0A colBinningFT0A{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}, true};
4082-
BinningTypeVtxZFV0A colBinningFV0A{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}, true};
4079+
BinningTypeVtxZFT0C colBinningFT0C{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}};
4080+
BinningTypeVtxZFT0M colBinningFT0M{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}};
4081+
BinningTypeVtxZFT0A colBinningFT0A{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}};
4082+
BinningTypeVtxZFV0A colBinningFV0A{{cfgMixing.c2010axisVtxMixing, cfgMixing.c2011axisCentMixing}};
40834083

40844084
template <typename C>
40854085
int getDerivedMixingBin(const C& collision)

‎PWGCF/TwoParticleCorrelations/Tasks/pidLongRange.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ struct PidLongRange {
15461546

15471547
using MixedBinning = FlexibleBinningPolicy<std::tuple<decltype(getTracksSize)>, aod::collision::PosZ, decltype(getTracksSize)>;
15481548

1549-
MixedBinning binningOnVtxAndMult{{getTracksSize}, {axisVtxMix, axisMultMix}, true};
1549+
MixedBinning binningOnVtxAndMult{{getTracksSize}, {axisVtxMix, axisMultMix}};
15501550

15511551
auto tracksTuple = std::make_tuple(tracks, tracks);
15521552
Pair<FilteredCollisions, FilteredTracks, FilteredTracks, MixedBinning> pairs{binningOnVtxAndMult, cfgGeneral.cfgMinMixEventNum, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip
@@ -1708,7 +1708,7 @@ struct PidLongRange {
17081708

17091709
using MixedBinning = FlexibleBinningPolicy<std::tuple<decltype(getTracksSize)>, aod::collision::PosZ, decltype(getTracksSize)>;
17101710

1711-
MixedBinning binningOnVtxAndMult{{getTracksSize}, {axisVtxMix, axisMultMix}, true};
1711+
MixedBinning binningOnVtxAndMult{{getTracksSize}, {axisVtxMix, axisMultMix}};
17121712

17131713
auto tracksTuple = std::make_tuple(tracks, tracks);
17141714
Pair<FilteredCollisions, FilteredTracks, FilteredTracks, MixedBinning> pairs{binningOnVtxAndMult, cfgGeneral.cfgMinMixEventNum, -1, collisions, tracksTuple, &cache}; // -1 is the number of the bin to skip

‎PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2192,7 +2192,7 @@ struct TwoParticleCorrelationsMpi {
21922192
return getAnalysisMultiplicity(col);
21932193
};
21942194
using BinningTypeDerived = FlexibleBinningPolicy<std::tuple<decltype(getMultiplicity)>, aod::collision::PosZ, decltype(getMultiplicity)>;
2195-
BinningTypeDerived configurableBinningDerived{{getMultiplicity}, {axisVertex, axisMultiplicity}, true}; // true is for 'ignore overflows' (true by default). Underflows and overflows will have bin -1.
2195+
BinningTypeDerived configurableBinningDerived{{getMultiplicity}, {axisVertex, axisMultiplicity}}; // underflows and overflows get bin -1
21962196
const float collisionMultiplicity = getMultiplicity(collision);
21972197
const float multiplicity = outputMultiplicityOverride ? *outputMultiplicityOverride : collisionMultiplicity;
21982198
const float efficiencyMultiplicity = efficiencyMultiplicityOverride ? *efficiencyMultiplicityOverride : collisionMultiplicity;

‎PWGLF/Tasks/Strangeness/lambdaspincorrderived.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2762,7 +2762,7 @@ struct lambdaspincorrderived {
27622762
// Processing Event Mixing
27632763
SliceCache cache;
27642764
using BinningType = ColumnBinningPolicy<aod::lambdaevent::Posz, aod::lambdaevent::Cent>;
2765-
BinningType colBinning{{CfgVtxBins, CfgMultBins}, true};
2765+
BinningType colBinning{{CfgVtxBins, CfgMultBins}};
27662766
Preslice<aod::LambdaPairs> tracksPerCollisionV0 = aod::lambdapair::lambdaeventId;
27672767

27682768
void processMEV3(EventCandidates const& collisions, AllTrackCandidates const& V0s)

0 commit comments

Comments
 (0)