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
3 changes: 3 additions & 0 deletions PWGLF/Utils/strangenessBuilderModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@
if (f == 1) {
baseOpts.mEnabledTables[i] = 1;
listOfRequestors[i] = "manual enabling";
nEnabledTables++;
}
if (f == -1) {
// autodetect this table in other devices
Expand All @@ -597,6 +598,8 @@
tableNameWithVersion += Form("_%03d", version);
}
if (input.matcher.binding == tableNameWithVersion) {
if (device.name == "strangenesstofpid")
continue;
LOGF(info, "Device %s has subscribed to %s (version %i)", device.name, tableNames[i], version);
listOfRequestors[i].Append(Form("%s ", device.name.c_str()));
baseOpts.mEnabledTables[i] = 1;
Expand Down Expand Up @@ -707,7 +710,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 713 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 @@ -906,7 +909,7 @@
} // end is_table<TMCCollisions>
} // end findable mode check

if (baseOpts.mc_findableMode.value < 2) {

Check failure on line 912 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 @@ -996,10 +999,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 1002 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 1005 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 @@ -1112,7 +1115,7 @@
}
}
// findable mode 2
if (baseOpts.mc_findableMode.value == 2) {

Check failure on line 1118 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 @@ -1159,7 +1162,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 1165 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 @@ -1285,7 +1288,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 1291 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 @@ -1362,7 +1365,7 @@
for (const auto& cascade : cascadeList) {
if (cascade.v0Id < 0)
continue;
if (v0Map[cascade.v0Id] == -2) {

Check failure on line 1368 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 @@ -1375,7 +1378,7 @@
trackedCascadeCount = trackedCascades.size();
for (const auto& trackedCascade : trackedCascades) {
auto const& cascade = trackedCascade.cascade();
if (v0Map[ao2dV0toV0List[cascade.v0Id()]] == -2) {

Check failure on line 1381 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 @@ -1410,7 +1413,7 @@
continue;
}

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

Check failure on line 1416 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
Loading