Skip to content
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

o2sim: For consistency we take the eventcount from collcontext #13827

Merged
merged 1 commit into from
Dec 20, 2024
+2 −2
Merged

o2sim: For consistency we take the eventcount from collcontext #13827

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: 2 additions & 2 deletions Common/SimConfig/src/SimConfig.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ void SimConfig::adjustFromCollContext(std::string const& collcontextfile, std::s
// we take what is specified in the context
mConfigData.mNEvents = collisionmap.size();
} else {
LOG(warning) << "The number of events on the command line " << mConfigData.mNEvents << " and in the collision context differ. Taking the min of the 2";
mConfigData.mNEvents = std::min((size_t)mConfigData.mNEvents, collisionmap.size());
LOG(warning) << "The number of events on the command line " << mConfigData.mNEvents << " and in the collision context differ. We take the one from collision context " << collisionmap.size();
mConfigData.mNEvents = collisionmap.size();
}
LOG(info) << "Setting number of events to simulate to " << mConfigData.mNEvents;
}
Expand Down
Loading