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.

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

Bugfix for trigger matching #92

Merged
merged 1 commit into from
Nov 19, 2024
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: 1 addition & 2 deletions src/makeCAF.C
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ buildTriggerList(std::map<const cafmaker::IRecoBranchFiller*, std::deque<cafmake
// do they have any events in them that should go in this group?
std::vector<decltype(triggersByFiller)::key_type> trigStreamsToRemove; // since we can't edit the `triggersByFiller` group without invalidating its iterators
std::vector<std::pair<const cafmaker::IRecoBranchFiller*, cafmaker::Trigger>> & trigGroup = ret.back();
const cafmaker::Trigger & trigSeed = trigGroup.front().second;
LOG().VERBOSE() << " Considering other triggers:\n";
for (auto & fillerTrigPair : triggersByFiller)
{
Expand All @@ -281,7 +280,7 @@ buildTriggerList(std::map<const cafmaker::IRecoBranchFiller*, std::deque<cafmake
// we will only take at most one trigger from each of the other streams.
// since the seed was the earliest one out of all the triggers,
// we only need to check the first one in each other stream
if (doTriggersMatch( trigSeed, fillerTrigPair.second.front(), trigMatchMaxDT))
if (doTriggersMatch( trigGroup.front().second, fillerTrigPair.second.front(), trigMatchMaxDT))
{
ss << " --> MATCHES\n";
trigGroup.push_back({fillerTrigPair.first, std::move(fillerTrigPair.second.front())});
Expand Down