Skip to content

Commit 86fca7e

Browse files
committed
DPL: move analysis topology helper methods to a separate class
On their way to a separate plugin
1 parent c148c39 commit 86fca7e

File tree

8 files changed

+624
-576
lines changed

8 files changed

+624
-576
lines changed

Framework/Core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ o2_add_library(Framework
1616
src/ArrowSupport.cxx
1717
src/ArrowTableSlicingCache.cxx
1818
src/AnalysisDataModel.cxx
19+
src/AnalysisSupportHelpers.cxx
1920
src/ASoA.cxx
2021
src/AsyncQueue.cxx
2122
src/AnalysisDataModelHelpers.cxx

Framework/Core/include/Framework/CommonDataProcessors.h

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,10 @@
1717
#include <vector>
1818
#include <string>
1919

20-
namespace o2::framework
21-
{
22-
23-
class DataOutputDirector;
24-
25-
struct OutputTaskInfo {
26-
uint32_t id;
27-
std::string name;
28-
};
29-
30-
struct OutputObjectInfo {
31-
uint32_t id;
32-
std::vector<std::string> bindings;
33-
};
34-
} // namespace o2::framework
35-
extern template class std::vector<o2::framework::OutputObjectInfo>;
36-
extern template class std::vector<o2::framework::OutputTaskInfo>;
3720
namespace o2::framework
3821
{
3922
/// Helpers to create a few general data processors
4023
struct CommonDataProcessors {
41-
/// Match all inputs of kind ATSK and write them to a ROOT file,
42-
/// one root file per originating task.
43-
static DataProcessorSpec getOutputObjHistSink(std::vector<OutputObjectInfo> const& objmap,
44-
std::vector<OutputTaskInfo> const& tskmap);
4524
/// Given the list of @a danglingInputs @return a DataProcessor which does
4625
/// a binary dump for all the dangling inputs matching the Timeframe
4726
/// lifetime. @a unmatched will be filled with all the InputSpecs which are
@@ -54,10 +33,6 @@ struct CommonDataProcessors {
5433
/// @fixme: for now only the dangling inputs are forwarded.
5534
static DataProcessorSpec getGlobalFairMQSink(std::vector<InputSpec> const& danglingInputs);
5635

57-
/// writes inputs of kind AOD to file
58-
static DataProcessorSpec getGlobalAODSink(std::shared_ptr<DataOutputDirector> dod,
59-
std::vector<InputSpec> const& outputInputs);
60-
6136
/// @return a dummy DataProcessorSpec which requires all the passed @a InputSpec
6237
/// and simply discards them. @a rateLimitingChannelConfig is the configuration
6338
/// for the rate limiting channel, if any required.
@@ -67,4 +42,4 @@ struct CommonDataProcessors {
6742

6843
} // namespace o2::framework
6944

70-
#endif // o2_framework_CommonDataProcessors_H_INCLUDED
45+
#endif // O2_FRAMEWORK_COMMONDATAPROCESSORS_H_

0 commit comments

Comments
 (0)