Remove TaskName (#5663)

jgrosseo · web-flow · commit 60e66affd3d1 · 2021-03-10T22:19:13.000+01:00
diff --git a/Analysis/Tasks/PWGCF/correlations.cxx b/Analysis/Tasks/PWGCF/correlations.cxx
@@ -323,5 +323,5 @@ struct CorrelationTask {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};
+    adaptAnalysisTask<CorrelationTask>(cfgc)};
 }
diff --git a/Analysis/Tasks/PWGCF/correlationsFiltered.cxx b/Analysis/Tasks/PWGCF/correlationsFiltered.cxx
@@ -441,5 +441,5 @@ struct CorrelationTask {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};
+    adaptAnalysisTask<CorrelationTask>(cfgc)};
 }
diff --git a/Analysis/Tasks/PWGCF/correlationsMixed.cxx b/Analysis/Tasks/PWGCF/correlationsMixed.cxx
@@ -78,7 +78,7 @@ struct HashTask {
 
 #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
 
-struct CorrelationTask {
+struct CorrelationTaskMixed {
 
   // Input definitions
   using myTracks = soa::Filtered<aod::Tracks>;
@@ -503,6 +503,6 @@ struct CorrelationTask {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<HashTask>(cfgc, TaskName{"produce-hashes"}),
-    adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};
+    adaptAnalysisTask<HashTask>(cfgc),
+    adaptAnalysisTask<CorrelationTaskMixed>(cfgc)};
 }
diff --git a/Analysis/Tasks/PWGCF/filterCF.cxx b/Analysis/Tasks/PWGCF/filterCF.cxx
@@ -78,5 +78,5 @@ struct FilterCF {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<FilterCF>(cfgc, TaskName{"filter-cf"})};
+    adaptAnalysisTask<FilterCF>(cfgc)};
 }

Original file line number	Diff line number	Diff line change
`@@ -323,5 +323,5 @@ struct CorrelationTask {`
`323`	`323`	`WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`324`	`324`	`{`
`325`	`325`	`return WorkflowSpec{`
`326`		`- adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};`
	`326`	`+ adaptAnalysisTask<CorrelationTask>(cfgc)};`
`327`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -441,5 +441,5 @@ struct CorrelationTask {`
`441`	`441`	`WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`442`	`442`	`{`
`443`	`443`	`return WorkflowSpec{`
`444`		`- adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};`
	`444`	`+ adaptAnalysisTask<CorrelationTask>(cfgc)};`
`445`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ struct HashTask {`
`78`	`78`
`79`	`79`	`#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};`
`80`	`80`
`81`		`-struct CorrelationTask {`
	`81`	`+struct CorrelationTaskMixed {`
`82`	`82`
`83`	`83`	`// Input definitions`
`84`	`84`	`using myTracks = soa::Filtered<aod::Tracks>;`
`@@ -503,6 +503,6 @@ struct CorrelationTask {`
`503`	`503`	`WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`504`	`504`	`{`
`505`	`505`	`return WorkflowSpec{`
`506`		`- adaptAnalysisTask<HashTask>(cfgc, TaskName{"produce-hashes"}),`
`507`		`- adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};`
	`506`	`+ adaptAnalysisTask<HashTask>(cfgc),`
	`507`	`+ adaptAnalysisTask<CorrelationTaskMixed>(cfgc)};`
`508`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,5 @@ struct FilterCF {`
`78`	`78`	`WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`79`	`79`	`{`
`80`	`80`	`return WorkflowSpec{`
`81`		`- adaptAnalysisTask<FilterCF>(cfgc, TaskName{"filter-cf"})};`
	`81`	`+ adaptAnalysisTask<FilterCF>(cfgc)};`
`82`	`82`	`}`