Skip to content

Commit 01bb36a

Browse files
davidrohrdavidrohr
committed
TPC: Rename raw to clustershardware in workflow
1 parent f4b904f commit 01bb36a

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎Detectors/TPC/workflow/include/TPCWorkflow/RecoWorkflow.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ namespace tpc
2828
namespace reco_workflow
2929
{
3030
/// define input and output types of the workflow
31-
enum struct InputType { Digitizer, // directly read digits from channel {TPC:DIGITS}
32-
Digits, // read digits from file
33-
Raw, // read hardware clusters in raw page format from file
34-
Clusters, // read native clusters from file
31+
enum struct InputType { Digitizer, // directly read digits from channel {TPC:DIGITS}
32+
Digits, // read digits from file
33+
ClustersHardware, // read hardware clusters in raw page format from file
34+
Clusters, // read native clusters from file
3535
};
3636
enum struct OutputType { Digits,
37-
Raw,
37+
ClustersHardware,
3838
Clusters,
3939
Tracks,
4040
DisableWriter,

‎Detectors/TPC/workflow/src/RecoWorkflow.cxx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ using BranchDefinition = MakeRootTreeWriterSpec::BranchDefinition<T>;
5656
const std::unordered_map<std::string, InputType> InputMap{
5757
{"digitizer", InputType::Digitizer},
5858
{"digits", InputType::Digits},
59-
{"raw", InputType::Raw},
59+
{"clustershardware", InputType::ClustersHardware},
6060
{"clusters", InputType::Clusters},
6161
};
6262

6363
const std::unordered_map<std::string, OutputType> OutputMap{
6464
{"digits", OutputType::Digits},
65-
{"raw", OutputType::Raw},
65+
{"clustershardware", OutputType::ClustersHardware},
6666
{"clusters", OutputType::Clusters},
6767
{"tracks", OutputType::Tracks},
6868
{"disable-writer", OutputType::DisableWriter},
@@ -89,18 +89,18 @@ framework::WorkflowSpec getWorkflow(std::vector<int> const& tpcSectors, std::vec
8989
return std::find(outputTypes.begin(), outputTypes.end(), type) != outputTypes.end();
9090
};
9191

92-
if (inputType == InputType::Raw && isEnabled(OutputType::Digits)) { // TODO: We should rename Raw to
93-
throw std::invalid_argument("input/output type mismatch, can not produce 'digits' from 'raw'");
92+
if (inputType == InputType::ClustersHardware && isEnabled(OutputType::Digits)) {
93+
throw std::invalid_argument("input/output type mismatch, can not produce 'digits' from 'clustershardware'");
9494
}
95-
if (inputType == InputType::Clusters && (isEnabled(OutputType::Digits) || isEnabled(OutputType::Raw))) {
96-
throw std::invalid_argument("input/output type mismatch, can not produce 'digits', nor 'raw' from 'clusters'");
95+
if (inputType == InputType::Clusters && (isEnabled(OutputType::Digits) || isEnabled(OutputType::ClustersHardware))) {
96+
throw std::invalid_argument("input/output type mismatch, can not produce 'digits', nor 'clustershardware' from 'clusters'");
9797
}
9898

99-
if (caClusterer && (inputType == InputType::Clusters || inputType == InputType::Raw)) {
99+
if (caClusterer && (inputType == InputType::Clusters || inputType == InputType::ClustersHardware)) {
100100
throw std::invalid_argument("ca-clusterer requires digits as input");
101101
}
102-
if (caClusterer && (isEnabled(OutputType::Clusters) || isEnabled(OutputType::Raw))) {
103-
throw std::invalid_argument("ca-clusterer cannot produce Clusters or Raw output");
102+
if (caClusterer && (isEnabled(OutputType::Clusters) || isEnabled(OutputType::ClustersHardware))) {
103+
throw std::invalid_argument("ca-clusterer cannot produce clusters or clustershardware output");
104104
}
105105

106106
WorkflowSpec specs;
@@ -122,11 +122,11 @@ framework::WorkflowSpec getWorkflow(std::vector<int> const& tpcSectors, std::vec
122122
laneConfiguration,
123123
},
124124
propagateMC));
125-
} else if (inputType == InputType::Raw) {
125+
} else if (inputType == InputType::ClustersHardware) {
126126
specs.emplace_back(o2::tpc::getPublisherSpec(PublisherConf{
127-
"tpc-raw-cluster-reader",
128-
"tpcraw",
129-
{"databranch", "TPCClusterHw", "Branch with TPC raw clusters"},
127+
"tpc-clusterhardware-reader",
128+
"tpcclustershardware",
129+
{"databranch", "TPCClusterHw", "Branch with TPC ClustersHardware"},
130130
{"mcbranch", "TPCClusterHwMCTruth", "MC label branch"},
131131
OutputSpec{"TPC", "CLUSTERHW"},
132132
OutputSpec{"TPC", "CLUSTERHWMCLBL"},
@@ -151,11 +151,11 @@ framework::WorkflowSpec getWorkflow(std::vector<int> const& tpcSectors, std::vec
151151
// output matrix
152152
bool runTracker = isEnabled(OutputType::Tracks);
153153
bool runDecoder = !caClusterer && (runTracker || isEnabled(OutputType::Clusters));
154-
bool runClusterer = !caClusterer && (runDecoder || isEnabled(OutputType::Raw));
154+
bool runClusterer = !caClusterer && (runDecoder || isEnabled(OutputType::ClustersHardware));
155155

156156
// input matrix
157157
runClusterer &= inputType == InputType::Digitizer || inputType == InputType::Digits;
158-
runDecoder &= runClusterer || inputType == InputType::Raw;
158+
runDecoder &= runClusterer || inputType == InputType::ClustersHardware;
159159
runTracker &= caClusterer || (runDecoder || inputType == InputType::Clusters);
160160

161161
WorkflowSpec parallelProcessors;
@@ -299,14 +299,14 @@ framework::WorkflowSpec getWorkflow(std::vector<int> const& tpcSectors, std::vec
299299

300300
//////////////////////////////////////////////////////////////////////////////////////////////
301301
//
302-
// a writer process for raw hardware clusters
302+
// a writer process for hardware clusters
303303
//
304-
// selected by output type 'raw'
305-
if (isEnabled(OutputType::Raw) && !isEnabled(OutputType::DisableWriter)) {
304+
// selected by output type 'clustershardware'
305+
if (isEnabled(OutputType::ClustersHardware) && !isEnabled(OutputType::DisableWriter)) {
306306
using MCLabelContainer = o2::dataformats::MCTruthContainer<o2::MCCompLabel>;
307-
specs.push_back(makeWriterSpec("tpc-raw-cluster-writer",
308-
inputType == InputType::Raw ? "tpc-filtered-raw-clusters.root" : "tpc-raw-clusters.root",
309-
"tpcraw",
307+
specs.push_back(makeWriterSpec("tpc-clusterhardware-writer",
308+
inputType == InputType::ClustersHardware ? "tpc-filtered-clustershardware.root" : "tpc-clustershardware.root",
309+
"tpcclustershardware",
310310
BranchDefinition<const char*>{InputSpec{"data", "TPC", "CLUSTERHW", 0},
311311
"TPCClusterHw",
312312
"databranch"},

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4040
using namespace o2::framework;
4141

4242
std::vector<ConfigParamSpec> options{
43-
{"input-type", VariantType::String, "digits", {"digitizer, digits, raw, clusters"}},
44-
{"output-type", VariantType::String, "tracks", {"digits, raw, clusters, tracks, disable-writer"}},
43+
{"input-type", VariantType::String, "digits", {"digitizer, digits, clustershw, clustersnative"}},
44+
{"output-type", VariantType::String, "tracks", {"digits, clustershw, clustersnative, tracks, disable-writer"}},
4545
{"ca-clusterer", VariantType::Bool, false, {"Use clusterer of GPUCATracking"}},
4646
{"disable-mc", VariantType::Bool, false, {"disable sending of MC information"}},
4747
{"tpc-sectors", VariantType::String, "0-35", {"TPC sector range, e.g. 5-7,8,9"}},
@@ -90,11 +90,11 @@ using namespace o2::framework;
9090
/// and contains the following default processors
9191
/// - digit reader
9292
/// - clusterer
93-
/// - cluster raw decoder
93+
/// - ClusterHardware Decoder
9494
/// - CA tracker
9595
///
9696
/// The default workflow can be customized by specifying input and output types
97-
/// e.g. digits, raw, tracks.
97+
/// e.g. digits, clustershw, tracks.
9898
///
9999
/// MC info is processed by default, disabled by using command line option `--disable-mc`
100100
///
@@ -123,9 +123,9 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
123123
// trigger and all messages will be sent out together at end of computation
124124
} else if (inputType == "digits") {
125125
gDispatchTrigger = o2::framework::Output{"TPC", "DIGITS"};
126-
} else if (inputType == "raw") {
126+
} else if (inputType == "clustershw") {
127127
gDispatchTrigger = o2::framework::Output{"TPC", "CLUSTERHW"};
128-
} else if (inputType == "clusters") {
128+
} else if (inputType == "clustersnative") {
129129
gDispatchTrigger = o2::framework::Output{"TPC", "CLUSTERNATIVE"};
130130
}
131131
// set up configuration

0 commit comments

Comments
 (0)