Skip to content

Fix abuse of o2::framework::Output #14384

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
ktf merged 1 commit into from
Jun 10, 2025
Merged

Fix abuse of o2::framework::Output #14384

Show file tree
Hide file tree
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 Detectors/TPC/workflow/src/TrackReaderWorkflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

// we need a global variable to propagate the type the message dispatching of the
// publisher will trigger on. This is dependent on the input type
o2::framework::Output gDispatchTrigger{"", ""};
o2::framework::ConcreteDataTypeMatcher gDispatchTrigger{"", ""};

void customize(std::vector<o2::framework::CallbacksPolicy>& policies)
{
Expand Down Expand Up @@ -96,7 +96,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
// nothing to do we leave the matcher empty which will suppress the dispatch
// trigger and all messages will be sent out together at end of computation
} else if (inputType == "tracks") {
gDispatchTrigger = o2::framework::Output{"TPC", "TRACKS"};
gDispatchTrigger = o2::framework::ConcreteDataTypeMatcher{"TPC", "TRACKS"};
}

bool doMC = not cfgc.options().get<bool>("disable-mc");
Expand Down
10 changes: 5 additions & 5 deletions Detectors/TPC/workflow/src/tpc-reco-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

// we need a global variable to propagate the type the message dispatching of the
// publisher will trigger on. This is dependent on the input type
static o2::framework::Output gDispatchTrigger{"", ""};
static o2::framework::ConcreteDataTypeMatcher gDispatchTrigger{"", ""};

// Global variable used to transport data to the completion policy
static o2::tpc::reco_workflow::CompletionPolicyData gPolicyData;
Expand Down Expand Up @@ -152,13 +152,13 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
// nothing to do we leave the matcher empty which will suppress the dispatch
// trigger and all messages will be sent out together at end of computation
} else if (inputType == "digits") {
gDispatchTrigger = o2::framework::Output{"TPC", "DIGITS"};
gDispatchTrigger = o2::framework::ConcreteDataTypeMatcher{"TPC", "DIGITS"};
} else if (inputType == "clustershw") {
gDispatchTrigger = o2::framework::Output{"TPC", "CLUSTERHW"};
gDispatchTrigger = o2::framework::ConcreteDataTypeMatcher{"TPC", "CLUSTERHW"};
} else if (inputType == "clustersnative") {
gDispatchTrigger = o2::framework::Output{"TPC", "CLUSTERNATIVE"};
gDispatchTrigger = o2::framework::ConcreteDataTypeMatcher{"TPC", "CLUSTERNATIVE"};
} else if (inputType == "zsraw") {
gDispatchTrigger = o2::framework::Output{"TPC", "RAWDATA"};
gDispatchTrigger = o2::framework::ConcreteDataTypeMatcher{"TPC", "RAWDATA"};
}
// set up configuration
o2::conf::ConfigurableParam::updateFromFile(cfgc.options().get<std::string>("configFile"));
Expand Down