Skip to content

[PWGJE] emcalCorrectionTask.cxx: Add max number of table size per DF #16762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhemmer-cern wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −20
Open

[PWGJE] emcalCorrectionTask.cxx: Add max number of table size per DF #16762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 37 additions & 20 deletions PWGJE/TableProducer/emcalCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,12 @@ struct EmcalCorrectionTask {
int runNumber{0};

static constexpr float TrackNotOnEMCal = -900.f;
static constexpr int kMaxMatchesPerCluster = 20; // Maximum number of tracks to match per cluster
static constexpr int MaxMatchesPerCluster = 20; // Maximum number of tracks to match per cluster

static constexpr uint MaxClusterPerDFPerClusterizer = 200'000; // memory footprint: 13 MB per clusterizer
static constexpr uint MaxAmbClusterPerDFPerClusterizer = 300'000; // memory footprint: 19.5 MB per clusterizer
static constexpr uint MaxCellsPerClusterPerDFPerClusterizer = 300'000; // memory footprint: 4.8 MB per clusterizer
static constexpr uint MaxCellsPerAmbClusterPerDFPerClusterizer = 450'000; // memory footprint: 7.2 MB per clusterizer

// cluster size
size_t nCluster = 0;
Expand Down Expand Up @@ -414,6 +419,10 @@ struct EmcalCorrectionTask {
void processFull(BcEvSels const& bcs, CollEventSels const& collisions, MyGlobTracks const& tracks, FilteredCells const& cells)
{
LOG(debug) << "Starting process full.";
clusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
clustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
clustercells.reserve(MaxCellsPerClusterPerDFPerClusterizer * mClusterizers.size());
clustercellsambiguous.reserve(MaxCellsPerAmbClusterPerDFPerClusterizer * mClusterizers.size());

int previousCollisionId = 0; // Collision ID of the last unique BC. Needed to skip unordered collisions to ensure ordered collisionIds in the cluster table
int nBCsProcessed = 0;
Expand Down Expand Up @@ -570,6 +579,11 @@ struct EmcalCorrectionTask {
{
LOG(debug) << "Starting process full.";

clusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
clustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
clustercells.reserve(MaxCellsPerClusterPerDFPerClusterizer * mClusterizers.size());
clustercellsambiguous.reserve(MaxCellsPerAmbClusterPerDFPerClusterizer * mClusterizers.size());

int previousCollisionId = 0; // Collision ID of the last unique BC. Needed to skip unordered collisions to ensure ordered collisionIds in the cluster table
int nBCsProcessed = 0;
int nCellsProcessed = 0;
Expand Down Expand Up @@ -730,6 +744,13 @@ struct EmcalCorrectionTask {
{
LOG(debug) << "Starting processMCFull.";

clusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
mcclusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
clustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
mcclustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
clustercells.reserve(MaxCellsPerClusterPerDFPerClusterizer * mClusterizers.size());
clustercellsambiguous.reserve(MaxCellsPerAmbClusterPerDFPerClusterizer * mClusterizers.size());

int previousCollisionId = 0; // Collision ID of the last unique BC. Needed to skip unordered collisions to ensure ordered collisionIds in the cluster table
int nBCsProcessed = 0;
int nCellsProcessed = 0;
Expand Down Expand Up @@ -918,6 +939,13 @@ struct EmcalCorrectionTask {
{
LOG(debug) << "Starting processMCWithSecondaries.";

clusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
mcclusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
clustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
mcclustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
clustercells.reserve(MaxCellsPerClusterPerDFPerClusterizer * mClusterizers.size());
clustercellsambiguous.reserve(MaxCellsPerAmbClusterPerDFPerClusterizer * mClusterizers.size());

int previousCollisionId = 0; // Collision ID of the last unique BC. Needed to skip unordered collisions to ensure ordered collisionIds in the cluster table
int nBCsProcessed = 0;
int nCellsProcessed = 0;
Expand Down Expand Up @@ -1107,6 +1135,12 @@ struct EmcalCorrectionTask {
void processStandalone(BcEvSels const& bcs, aod::Collisions const& collisions, FilteredCells const& cells)
{
LOG(debug) << "Starting process standalone.";

clusters.reserve(MaxClusterPerDFPerClusterizer * mClusterizers.size());
clustersAmbiguous.reserve(MaxAmbClusterPerDFPerClusterizer * mClusterizers.size());
clustercells.reserve(MaxCellsPerClusterPerDFPerClusterizer * mClusterizers.size());
clustercellsambiguous.reserve(MaxCellsPerAmbClusterPerDFPerClusterizer * mClusterizers.size());

int previousCollisionId = 0; // Collision ID of the last unique BC. Needed to skip unordered collisions to ensure ordered collisionIds in the cluster table
int nBCsProcessed = 0;
int nCellsProcessed = 0;
Expand Down Expand Up @@ -1270,16 +1304,6 @@ struct EmcalCorrectionTask {
template <typename Collision>
void fillClusterTable(Collision const& col, math_utils::Point3D<float> const& vertexPos, size_t iClusterizer, const gsl::span<int64_t> cellIndicesBC, MatchResult* indexMapPair = nullptr, const std::vector<int64_t>* trackGlobalIndex = nullptr, MatchResult* indexMapPairSecondaries = nullptr, const std::vector<int64_t>* secondariesGlobalIndex = nullptr)
{
// average number of cells per cluster, only used the reseve a reasonable amount for the clustercells table
// const size_t nAvgNcells = 3;
// we found a collision, put the clusters into the none ambiguous table
clusters.reserve(nCluster + mAnalysisClusters.size());
if (!mClusterLabels.empty()) {
mcclusters.reserve(nCluster + mClusterLabels.size());
}
// Since reserve triggers a fatal when its too small, it is not save for cells to use it unless we use a really large buffer...
// clustercells.reserve(mAnalysisClusters.size() * nAvgNcells);

// get the clusterType once
const auto clusterType = static_cast<int>(mClusterDefinitions[iClusterizer]);

Expand Down Expand Up @@ -1368,14 +1392,7 @@ struct EmcalCorrectionTask {
template <typename BC>
void fillAmbigousClusterTable(BC const& bc, size_t iClusterizer, const gsl::span<int64_t> cellIndicesBC, bool hasCollision)
{
// average number of cells per cluster, only used the reseve a reasonable amount for the clustercells table
// const size_t nAvgNcells = 3;
int cellindex = -1;
clustersAmbiguous.reserve(mAnalysisClusters.size() + nClusterAmb);
if (mClusterLabels.size() > 0) {
mcclustersAmbiguous.reserve(mClusterLabels.size() + nClusterAmb);
}
// clustercellsambiguous.reserve(mAnalysisClusters.size() * nAvgNcells);
unsigned int iCluster = 0;
float energy = 0.f;
for (const auto& cluster : mAnalysisClusters) {
Expand Down Expand Up @@ -1433,7 +1450,7 @@ struct EmcalCorrectionTask {
trackGlobalIndex.reserve(nTracksInCol);
fillTrackInfo<decltype(groupedTracks)>(groupedTracks, trackPhi, trackEta, trackGlobalIndex);

indexMapPair = matchTracksToCluster(mClusterPhi, mClusterEta, trackPhi, trackEta, maxMatchingDistance, kMaxMatchesPerCluster);
indexMapPair = matchTracksToCluster(mClusterPhi, mClusterEta, trackPhi, trackEta, maxMatchingDistance, MaxMatchesPerCluster);
}

template <typename Collision>
Expand Down Expand Up @@ -1469,7 +1486,7 @@ struct EmcalCorrectionTask {
trackEta.emplace_back(trackEtaEmcal);
trackGlobalIndex.emplace_back(track.globalIndex());
}
indexMapPair = matchTracksToCluster(mClusterPhi, mClusterEta, trackPhi, trackEta, maxMatchingDistance, kMaxMatchesPerCluster);
indexMapPair = matchTracksToCluster(mClusterPhi, mClusterEta, trackPhi, trackEta, maxMatchingDistance, MaxMatchesPerCluster);
}

template <typename Tracks>
Expand Down
Loading