Skip to content

Commit c8eb93c

Browse files
authored
DPL Analysis: rename aod::Hashes for upcoming O2 update (#8231)
1 parent 7e952e6 commit c8eb93c

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

PWGCF/DataModel/FemtoDerived.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,8 @@ namespace hash
451451
{
452452
DECLARE_SOA_COLUMN(Bin, bin, int); //! Hash for the event mixing
453453
} // namespace hash
454-
DECLARE_SOA_TABLE(Hashes, "AOD", "HASH", hash::Bin);
455-
using Hash = Hashes::iterator;
454+
DECLARE_SOA_TABLE(MixingHashes, "AOD", "HASH", hash::Bin);
455+
using MixingHash = MixingHashes::iterator;
456456

457457
} // namespace o2::aod
458458

PWGCF/FemtoDream/Tasks/femtoDreamHashTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct femtoDreamPairHashTask {
3131

3232
std::vector<float> CastCfgVtxBins, CastCfgMultBins;
3333

34-
Produces<aod::Hashes> hashes;
34+
Produces<aod::MixingHashes> hashes;
3535

3636
void init(InitContext&)
3737
{

PWGCF/FemtoUniverse/DataModel/FemtoDerived.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ namespace hash
301301
{
302302
DECLARE_SOA_COLUMN(Bin, bin, int); //! Hash for the event mixing
303303
} // namespace hash
304-
DECLARE_SOA_TABLE(Hashes, "AOD", "HASH", hash::Bin);
305-
using Hash = Hashes::iterator;
304+
DECLARE_SOA_TABLE(MixingHashes, "AOD", "HASH", hash::Bin);
305+
using MixingHash = MixingHashes::iterator;
306306

307307
} // namespace o2::aod
308308

PWGCF/FemtoUniverse/Tasks/femtoUniverseHashTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct femtoUniversePairHashTask {
3232

3333
std::vector<float> CastCfgVtxBins, CastCfgMultBins;
3434

35-
Produces<aod::Hashes> hashes;
35+
Produces<aod::MixingHashes> hashes;
3636

3737
void init(InitContext&)
3838
{

PWGCF/FemtoWorld/Tasks/femtoWorldHashTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct femtoWorldPairHashTask {
3333

3434
std::vector<float> CastCfgVtxBins, CastCfgMultBins;
3535

36-
Produces<aod::Hashes> hashes;
36+
Produces<aod::MixingHashes> hashes;
3737

3838
void init(InitContext&)
3939
{

Tutorials/src/eventMixing.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace hash
3131
{
3232
DECLARE_SOA_COLUMN(Bin, bin, int);
3333
} // namespace hash
34-
DECLARE_SOA_TABLE(Hashes, "AOD", "HASH", hash::Bin);
34+
DECLARE_SOA_TABLE(MixingHashes, "AOD", "HASH", hash::Bin);
3535

3636
} // namespace o2::aod
3737

@@ -304,7 +304,7 @@ struct MixedEventsTripleVariousKinds {
304304
struct HashTask {
305305
std::vector<float> xBins{-0.064f, -0.062f, -0.060f, 0.066f, 0.068f, 0.070f, 0.072};
306306
std::vector<float> yBins{-0.320f, -0.301f, -0.300f, 0.330f, 0.340f, 0.350f, 0.360};
307-
Produces<aod::Hashes> hashes;
307+
Produces<aod::MixingHashes> hashes;
308308

309309
// Calculate hash for an element based on 2 properties and their bins.
310310
int getHash(const std::vector<float>& xBins, const std::vector<float>& yBins, float colX, float colY)
@@ -341,7 +341,7 @@ struct HashTask {
341341

342342
struct MixedEventsWithHashTask {
343343
SliceCache cache;
344-
using myCollisions = soa::Join<aod::Hashes, aod::Collisions>;
344+
using myCollisions = soa::Join<aod::MixingHashes, aod::Collisions>;
345345
NoBinningPolicy<aod::hash::Bin> hashBin;
346346
SameKindPair<myCollisions, aod::Tracks, NoBinningPolicy<aod::hash::Bin>> pair{hashBin, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored
347347

Tutorials/src/tracksCombinations.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace hash
3030
{
3131
DECLARE_SOA_COLUMN(Bin, bin, int);
3232
} // namespace hash
33-
DECLARE_SOA_TABLE(Hashes, "AOD", "HASH", hash::Bin);
33+
DECLARE_SOA_TABLE(MixingHashes, "AOD", "HASH", hash::Bin);
3434

3535
} // namespace o2::aod
3636

@@ -116,7 +116,7 @@ struct BinnedTrackPartitionsCombinations {
116116
struct HashTask {
117117
std::vector<float> xBins{-0.064f, -0.062f, -0.060f, 0.066f, 0.068f, 0.070f, 0.072};
118118
std::vector<float> yBins{-0.320f, -0.301f, -0.300f, 0.330f, 0.340f, 0.350f, 0.360};
119-
Produces<aod::Hashes> hashes;
119+
Produces<aod::MixingHashes> hashes;
120120

121121
// Calculate hash for an element based on 2 properties and their bins.
122122
int getHash(const std::vector<float>& xBins, const std::vector<float>& yBins, float colX, float colY)
@@ -154,7 +154,7 @@ struct HashTask {
154154
struct BinnedTrackCombinationsWithHashTable {
155155
NoBinningPolicy<aod::hash::Bin> hashBin;
156156

157-
void process(soa::Join<aod::Hashes, aod::Tracks> const& hashedTracks)
157+
void process(soa::Join<aod::MixingHashes, aod::Tracks> const& hashedTracks)
158158
{
159159
int count = 0;
160160
// Strictly upper categorised tracks

0 commit comments

Comments
 (0)