Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions PWGLF/Utils/strangenessBuilderModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@
if (baseOpts.mc_findableMode.value == 1) {
LOGF(info, " ===> findable mode 1 is enabled: complement reco-ed with non-found findable");
}
if (baseOpts.mc_findableMode.value == 2) {

Check failure on line 656 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGF(info, " ===> findable mode 2 is enabled: re-generate all findable from scratch");
}

Expand Down Expand Up @@ -852,7 +852,7 @@
} // end is_table<TMCCollisions>
} // end findable mode check

if (baseOpts.mc_findableMode.value < 2) {

Check failure on line 855 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
// keep all unless de-duplication active
ao2dV0toV0List.resize(v0s.size(), -1); // -1 means keep, -2 means do not keep

Expand Down Expand Up @@ -939,10 +939,10 @@
if (bestPointingAngleIndex == ic && baseOpts.deduplicationAlgorithm.value == 1) {
ao2dV0toV0List[v0tableGrouped[iV0].V0Ids[ic]] = -1; // keep best only
}
if (bestDCADaughtersIndex == ic && baseOpts.deduplicationAlgorithm.value == 2) {

Check failure on line 942 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
ao2dV0toV0List[v0tableGrouped[iV0].V0Ids[ic]] = -1; // keep best only
}
if (bestDCADaughtersIndex == ic && bestPointingAngleIndex == ic && baseOpts.deduplicationAlgorithm.value == 3) {

Check failure on line 945 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
ao2dV0toV0List[v0tableGrouped[iV0].V0Ids[ic]] = -1; // keep best only
}
}
Expand Down Expand Up @@ -1055,7 +1055,7 @@
}
}
// findable mode 2
if (baseOpts.mc_findableMode.value == 2) {

Check failure on line 1058 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
currentV0Entry.globalId = -1;
currentV0Entry.collisionId = bestCollisionArray[positiveTrackIndex.mcCollisionId];
currentV0Entry.posTrackId = positiveTrackIndex.globalId;
Expand Down Expand Up @@ -1102,7 +1102,7 @@

// Cascade part if cores are requested, skip otherwise
if (baseOpts.mEnabledTables[kStoredCascCores] || baseOpts.mEnabledTables[kStoredKFCascCores]) {
if (baseOpts.mc_findableMode.value < 2) {

Check failure on line 1105 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
// simple passthrough: copy existing cascades to build list
for (const auto& cascade : cascades) {
auto const& v0 = cascade.v0();
Expand Down Expand Up @@ -1228,7 +1228,7 @@

// findable mode 2: determine type based on cascade table,
// with type 1 being reserved to findable-but-not-found
if (baseOpts.mc_findableMode.value == 2) {

Check failure on line 1231 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
currentCascadeEntry.globalId = -1;
currentCascadeEntry.collisionId = bestCollisionArray[bachelorTrackIndex.mcCollisionId];
currentCascadeEntry.v0Id = v0i; // fill this in one go later
Expand Down Expand Up @@ -1305,7 +1305,7 @@
for (const auto& cascade : cascadeList) {
if (cascade.v0Id < 0)
continue;
if (v0Map[cascade.v0Id] == -2) {

Check failure on line 1308 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
v0sUsedInCascades++;
}
v0Map[cascade.v0Id] = -1; // marks used (but isn't the index of a properly built V0, which would be >= 0)
Expand All @@ -1318,7 +1318,7 @@
trackedCascadeCount = trackedCascades.size();
for (const auto& trackedCascade : trackedCascades) {
auto const& cascade = trackedCascade.cascade();
if (v0Map[ao2dV0toV0List[cascade.v0Id()]] == -2) {

Check failure on line 1321 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
v0sUsedInCascades++;
}
v0Map[ao2dV0toV0List[cascade.v0Id()]] = -1; // marks used (but isn't the index of a built V0, which would be >= 0)
Expand Down Expand Up @@ -1353,7 +1353,7 @@
continue;
}

if (!baseOpts.mEnabledTables[kV0CoresBase] && v0Map[iv0] == -2) {

Check failure on line 1356 in PWGLF/Utils/strangenessBuilderModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
// this v0 hasn't been used by cascades and we're not generating V0s, so skip it
products.v0dataLink(-1, -1);
continue;
Expand Down Expand Up @@ -2403,12 +2403,14 @@
return; // don't do if no request for cascades in place or findable mode used
}
int nCascades = 0;
std::vector<int> traCascIndices(cascadeList.size(), -1);
// Loops over all V0s in the time frame
histos.fill(HIST("hInputStatistics"), kStoredTraCascCores, cascadeTracks.size());
for (const auto& cascadeTrack : cascadeTracks) {
// Get tracks and generate candidate
if (!cascadeTrack.has_track())
if (!cascadeTrack.has_track()) {
continue; // safety (should be fine but depends on future stratrack dev)
}

auto const& strangeTrack = cascadeTrack.template track_as<TTracks>();

Expand All @@ -2433,8 +2435,6 @@
baseOpts.mEnabledTables[kCascBBs],
cascadeBuilderOpts.useCascadeMomentumAtPrimVtx,
baseOpts.mEnabledTables[kCascCovs])) {
products.tracascdataLink(-1);
interlinks.cascadeToTraCascCores.push_back(-1);
continue; // didn't work out, skip
}

Expand Down Expand Up @@ -2474,9 +2474,7 @@
histos.fill(HIST("hTableBuildingStatistics"), kStoredTraCascCores);

// interlink always produced if base core table generated
products.tracascdataLink(products.tracascdata.lastIndex());
interlinks.traCascCoreToCascades.push_back(cascade.globalIndex());
interlinks.cascadeToTraCascCores.push_back(products.tracascdata.lastIndex());
traCascIndices[cascade.globalIndex()] = products.tracascdata.lastIndex();
}
if (baseOpts.mEnabledTables[kCascCovs]) {
std::array<float, o2::track::kLabCovMatSize> traCovMat = {0.};
Expand All @@ -2502,6 +2500,10 @@
} // enabled tables check
} // constexpr requires mcParticles check
} // end loop over cascades

for (std::size_t icascade = 0; icascade < cascadeList.size(); icascade++) {
products.tracascdataLink(traCascIndices[icascade]);
}
LOGF(debug, "Tracked cascades in DF: %i, tracked cascades built: %i", cascadeTracks.size(), nCascades);
}

Expand Down
Loading