Skip to content

Commit 7569c96

Browse files
saganattsaganatt
authored
DPL Analysis: Canonical task names (#5640)
1 parent 3e66fcc commit 7569c96

124 files changed

Lines changed: 331 additions & 243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Analysis/ALICE3/src/alice3-trackselection.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ struct TrackSelectionTask {
5252
//****************************************************************************************
5353
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
5454
{
55-
WorkflowSpec workflow{adaptAnalysisTask<TrackSelectionTask>(cfgc, "track-selection")};
55+
WorkflowSpec workflow{adaptAnalysisTask<TrackSelectionTask>(cfgc, TaskName{"track-selection"})};
5656
return workflow;
5757
}

‎Analysis/Tasks/PWGCF/correlations.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,5 +317,5 @@ struct CorrelationTask {
317317
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
318318
{
319319
return WorkflowSpec{
320-
adaptAnalysisTask<CorrelationTask>(cfgc, "correlation-task")};
320+
adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};
321321
}

‎Analysis/Tasks/PWGCF/correlationsFiltered.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,5 +441,5 @@ struct CorrelationTask {
441441
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
442442
{
443443
return WorkflowSpec{
444-
adaptAnalysisTask<CorrelationTask>(cfgc, "correlation-task")};
444+
adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};
445445
}

‎Analysis/Tasks/PWGCF/correlationsMixed.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,6 @@ struct CorrelationTask {
503503
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
504504
{
505505
return WorkflowSpec{
506-
adaptAnalysisTask<HashTask>(cfgc, "produce-hashes"),
507-
adaptAnalysisTask<CorrelationTask>(cfgc, "correlation-task")};
506+
adaptAnalysisTask<HashTask>(cfgc, TaskName{"produce-hashes"}),
507+
adaptAnalysisTask<CorrelationTask>(cfgc, TaskName{"correlation-task"})};
508508
}

‎Analysis/Tasks/PWGCF/dptdptcorrelations.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,13 +841,13 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
841841
int nranges = tokens->GetEntries();
842842

843843
WorkflowSpec workflow{
844-
adaptAnalysisTask<DptDptCorrelationsFilterAnalysisTask>(cfgc, "DptDptCorrelationsFilterAnalysisTask"),
845-
adaptAnalysisTask<TracksAndEventClassificationQA>(cfgc, "TracksAndEventClassificationQA")};
844+
adaptAnalysisTask<DptDptCorrelationsFilterAnalysisTask>(cfgc, TaskName{"DptDptCorrelationsFilterAnalysisTask"}),
845+
adaptAnalysisTask<TracksAndEventClassificationQA>(cfgc, TaskName{"TracksAndEventClassificationQA"})};
846846
for (int i = 0; i < nranges; ++i) {
847847
float cmmin = 0.0f;
848848
float cmmax = 0.0f;
849849
sscanf(tokens->At(i)->GetName(), "%f-%f", &cmmin, &cmmax);
850-
workflow.push_back(adaptAnalysisTask<DptDptCorrelationsTask>(cfgc, Form("DptDptCorrelationsTask-%s", tokens->At(i)->GetName()), cmmin, cmmax));
850+
workflow.push_back(adaptAnalysisTask<DptDptCorrelationsTask>(cfgc, TaskName{Form("DptDptCorrelationsTask-%s", tokens->At(i)->GetName())}, cmmin, cmmax));
851851
}
852852
delete tokens;
853853
return workflow;

‎Analysis/Tasks/PWGCF/filterCF.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ struct FilterCF {
7878
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
7979
{
8080
return WorkflowSpec{
81-
adaptAnalysisTask<FilterCF>(cfgc, "filter-cf")};
81+
adaptAnalysisTask<FilterCF>(cfgc, TaskName{"filter-cf"})};
8282
}

‎Analysis/Tasks/PWGDQ/dileptonEE.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ struct DileptonEE {
331331
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
332332
{
333333
return WorkflowSpec{
334-
adaptAnalysisTask<EventSelection>(cfgc, "my-event-selection"),
335-
adaptAnalysisTask<BarrelTrackSelection>(cfgc, "barrel-track-selection"),
336-
adaptAnalysisTask<DileptonEE>(cfgc, "dilepton-ee"),
334+
adaptAnalysisTask<EventSelection>(cfgc, TaskName{"my-event-selection"}),
335+
adaptAnalysisTask<BarrelTrackSelection>(cfgc, TaskName{"barrel-track-selection"}),
336+
adaptAnalysisTask<DileptonEE>(cfgc, TaskName{"dilepton-ee"}),
337337

338338
};
339339
}

‎Analysis/Tasks/PWGDQ/dileptonMuMu.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses)
373373
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
374374
{
375375
return WorkflowSpec{
376-
adaptAnalysisTask<EventSelection>(cfgc, "my-event-selection"),
377-
adaptAnalysisTask<MuonTrackSelection>(cfgc, "muon-track-selection"),
378-
adaptAnalysisTask<DileptonMuMu>(cfgc, "dilepton-mumu")};
376+
adaptAnalysisTask<EventSelection>(cfgc, TaskName{"my-event-selection"}),
377+
adaptAnalysisTask<MuonTrackSelection>(cfgc, TaskName{"muon-track-selection"}),
378+
adaptAnalysisTask<DileptonMuMu>(cfgc, TaskName{"dilepton-mumu"})};
379379
}

‎Analysis/Tasks/PWGDQ/filterPP.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ struct FilterPPTask {
321321
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
322322
{
323323
return WorkflowSpec{
324-
adaptAnalysisTask<EventSelectionTask>(cfgc, "dq-event-selection"),
325-
adaptAnalysisTask<BarrelTrackSelectionTask>(cfgc, "dq-barrel-track-selection"),
326-
adaptAnalysisTask<FilterPPTask>(cfgc, "dq-ppFilter")};
324+
adaptAnalysisTask<EventSelectionTask>(cfgc, TaskName{"dq-event-selection"}),
325+
adaptAnalysisTask<BarrelTrackSelectionTask>(cfgc, TaskName{"dq-barrel-track-selection"}),
326+
adaptAnalysisTask<FilterPPTask>(cfgc, TaskName{"dq-ppFilter"})};
327327
}
328328

329329
void DefineHistograms(HistogramManager* histMan, TString histClasses)

‎Analysis/Tasks/PWGDQ/tableMaker.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
241241
WorkflowSpec workflow;
242242
const bool isPbPb = cfgc.options().get<bool>("isPbPb");
243243
if (isPbPb) {
244-
workflow.push_back(adaptAnalysisTask<TableMaker<gkEventFillMap, MyEvents>>(cfgc, "table-maker"));
244+
workflow.push_back(adaptAnalysisTask<TableMaker<gkEventFillMap, MyEvents>>(cfgc, TaskName{"table-maker"}));
245245
} else {
246-
workflow.push_back(adaptAnalysisTask<TableMaker<gkEventFillMapNoCent, MyEventsNoCent>>(cfgc, "table-maker"));
246+
workflow.push_back(adaptAnalysisTask<TableMaker<gkEventFillMapNoCent, MyEventsNoCent>>(cfgc, TaskName{"table-maker"}));
247247
}
248248

249249
return workflow;

0 commit comments

Comments
 (0)