Skip to content

Bugfix for vertex copying in collision context #14453

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
sawenzel merged 2 commits into from
Jun 27, 2025
Merged

Bugfix for vertex copying in collision context #14453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8286e54
Fix vertex copying for last timeframe in collisioncontext
sawenzel Jun 27, 2025
a4213ad
o2-sim: Fix for merger exit status analysis
sawenzel Jun 27, 2025
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
2 changes: 1 addition & 1 deletion DataFormats/simulation/src/DigitizationContext.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ DigitizationContext DigitizationContext::extractSingleTimeframe(int timeframeid,
}
std::copy(mEventRecords.begin() + startindex, mEventRecords.begin() + endindex, std::back_inserter(r.mEventRecords));
std::copy(mEventParts.begin() + startindex, mEventParts.begin() + endindex, std::back_inserter(r.mEventParts));
if (mInteractionVertices.size() > endindex) {
if (mInteractionVertices.size() >= endindex) {
std::copy(mInteractionVertices.begin() + startindex, mInteractionVertices.begin() + endindex, std::back_inserter(r.mInteractionVertices));
}

Expand Down
2 changes: 1 addition & 1 deletion Steer/src/CollisionContextTool.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ int main(int argc, char* argv[])
std::stringstream str;
str << path_prefix << tf_output_counter++ << "/collisioncontext.root";
copy.saveToFile(str.str());
LOG(info) << "----";
LOG(info) << "---- CollisionContext for timeframe " << tf_id << " -----";
copy.printCollisionSummary();
}
}
Expand Down
5 changes: 2 additions & 3 deletions run/o2sim_parallel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,8 @@ int main(int argc, char* argv[])
// Handle mergerpid status separately
if (cpid == mergerpid) {
if (WIFEXITED(status)) {
// anything other than 128 is indicative of error
if (WEXITSTATUS(status) != 128) {
LOG(error) << "Merger process exited with abnormal code " << WEXITSTATUS(status);
if (WEXITSTATUS(status) != 0 || WEXITSTATUS(status) != 128) {
LOG(error) << "Merger process exited with abnormal exit status " << WEXITSTATUS(status);
errored = true;
}
} else if (WIFSIGNALED(status)) {
Expand Down