Skip to content

[AOD] Ensure the merger moves unassigned offset by the most negative index encountered #473

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

Merged
jgrosseo merged 1 commit into from
Jan 24, 2022
Merged

[AOD] Ensure the merger moves unassigned offset by the most negative index encountered #473

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
4 changes: 3 additions & 1 deletion Common/Core/aodMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,15 @@ int main(int argc, char* argv[])

auto entries = inputTree->GetEntries();
int minIndexOffset = unassignedIndexOffset[treeName];
auto newMinIndexOffset = minIndexOffset;
for (int i = 0; i < entries; i++) {
inputTree->GetEntry(i);
// shift index columns by offset
for (const auto& idx : indexList) {
// if negative, the index is unassigned. In this case, the different unassigned blocks have to get unique negative IDs
if (*(idx.first) < 0) {
*(idx.first) += minIndexOffset;
newMinIndexOffset = std::min(newMinIndexOffset, *(idx.first));
} else {
*(idx.first) += idx.second;
}
Expand All @@ -260,7 +262,7 @@ int main(int argc, char* argv[])
currentDirSize += nbytes;
}
}
unassignedIndexOffset[treeName] -= 1;
unassignedIndexOffset[treeName] = newMinIndexOffset;

delete inputTree;

Expand Down