Skip to content

Commit 84e4313

Browse files
authored
Fix abuse of o2::framework::Output (#14384)
This prevents support for std::pmr, because it implies movable outputs (which are not). Use the ConcreteDataTypeMatcher instead, which represents a query (matcher) on the data.
1 parent 69bdaa0 commit 84e4313

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Detectors/TPC/workflow/src/TrackReaderWorkflow.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

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

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

102102
bool doMC = not cfgc.options().get<bool>("disable-mc");

Detectors/TPC/workflow/src/tpc-reco-workflow.cxx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

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

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

0 commit comments

Comments
 (0)