Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change task names, move initializers #5205

Merged
merged 2 commits into from
Jan 18, 2021
Merged

Change task names, move initializers #5205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
519e2c7
Changes in names, initializers
ddobrigk Jan 17, 2021
30bbe10
Change consumer -> analysis, producer -> builder
ddobrigk Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions Analysis/Tasks/PWGLF/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ o2_add_dpl_workflow(nuclei-spectra
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel
COMPONENT_NAME Analysis)

o2_add_dpl_workflow(lambdakzeroproducer
SOURCES lambdakzeroproducer
o2_add_dpl_workflow(lambdakzerobuilder
SOURCES lambdakzerobuilder
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
COMPONENT_NAME Analysis)

o2_add_dpl_workflow(lambdakzeroconsumer
SOURCES lambdakzeroconsumer
o2_add_dpl_workflow(lambdakzeroanalysis
SOURCES lambdakzeroanalysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
COMPONENT_NAME Analysis)

Expand All @@ -43,13 +43,13 @@ o2_add_dpl_workflow(lambdakzerofinder
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
COMPONENT_NAME Analysis)

o2_add_dpl_workflow(cascadeproducer
SOURCES cascadeproducer
o2_add_dpl_workflow(cascadebuilder
SOURCES cascadebuilder
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
COMPONENT_NAME Analysis)

o2_add_dpl_workflow(cascadeconsumer
SOURCES cascadeconsumer
o2_add_dpl_workflow(cascadeanalysis
SOURCES cascadeanalysis
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsVertexing
COMPONENT_NAME Analysis)

Expand Down
13 changes: 3 additions & 10 deletions Analysis/Tasks/PWGLF/cascadeconsumer.cxx → Analysis/Tasks/PWGLF/cascadeanalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct cascadeQA {
}
};

struct cascadeconsumer {
struct cascadeanalysis {
OutputObj<TH3F> h3dMassXiMinus{TH3F("h3dMassXiMinus", "", 20, 0, 100, 200, 0, 10, 200, 1.322 - 0.100, 1.322 + 0.100)};
OutputObj<TH3F> h3dMassXiPlus{TH3F("h3dMassXiPlus", "", 20, 0, 100, 200, 0, 10, 200, 1.322 - 0.100, 1.322 + 0.100)};
OutputObj<TH3F> h3dMassOmegaMinus{TH3F("h3dMassOmegaMinus", "", 20, 0, 100, 200, 0, 10, 200, 1.672 - 0.100, 1.672 + 0.100)};
Expand Down Expand Up @@ -155,16 +155,9 @@ struct cascadeconsumer {
}
};

/// Extends the v0data table with expression columns
struct cascadeinitializer {
Spawns<aod::CascDataExt> cascdataext;
void init(InitContext const&) {}
};

WorkflowSpec defineDataProcessing(ConfigContext const&)
{
return WorkflowSpec{
adaptAnalysisTask<cascadeconsumer>("lf-cascadeconsumer"),
adaptAnalysisTask<cascadeQA>("lf-cascadeQA"),
adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer")};
adaptAnalysisTask<cascadeanalysis>("lf-cascadeanalysis"),
adaptAnalysisTask<cascadeQA>("lf-cascadeQA")};
}
16 changes: 8 additions & 8 deletions Analysis/Tasks/PWGLF/cascadeproducer.cxx → Analysis/Tasks/PWGLF/cascadebuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
//
// Cascade Producer task
// Cascade builder task
// =====================
//
// This task loops over an *existing* list of cascades (V0+bachelor track
Expand All @@ -17,7 +17,7 @@
// Any analysis should loop over the "CascData"
// table as that table contains all information
//
// WARNING: adding filters to the producer IS NOT
// WARNING: adding filters to the builder IS NOT
// equivalent to re-running the finders. This will only
// ever produce *tighter* selection sections. It is your
// responsibility to check if, by setting a loose filter
Expand Down Expand Up @@ -151,7 +151,7 @@ struct cascadeprefilterpairs {
};

/// Cascade builder task: rebuilds cascades
struct cascadeproducer {
struct cascadebuilder {
Produces<aod::CascData> cascdata;

OutputObj<TH1F> hEventCounter{TH1F("hEventCounter", "", 1, 0, 1)};
Expand Down Expand Up @@ -268,16 +268,16 @@ struct cascadeproducer {
}
};

/// Extends the v0data table with expression columns
struct cascprodinitializer {
Spawns<aod::V0DataExt> v0dataext;
/// Extends the cascdata table with expression columns
struct cascadeinitializer {
Spawns<aod::CascDataExt> cascdataext;
void init(InitContext const&) {}
};

WorkflowSpec defineDataProcessing(ConfigContext const&)
{
return WorkflowSpec{
adaptAnalysisTask<cascprodinitializer>("lf-cascprodinitializer"),
adaptAnalysisTask<cascadeprefilterpairs>("lf-cascadeprefilterpairs"),
adaptAnalysisTask<cascadeproducer>("lf-cascadeproducer")};
adaptAnalysisTask<cascadebuilder>("lf-cascadebuilder"),
adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer")};
}
6 changes: 3 additions & 3 deletions Analysis/Tasks/PWGLF/cascadefinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ struct cascadefinderQA {
}
};

/// Extends the v0data table with expression columns
/// Extends the cascdata table with expression columns
struct cascadeinitializer {
Spawns<aod::CascDataExt> cascdataext;
void init(InitContext const&) {}
Expand All @@ -433,6 +433,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
return WorkflowSpec{
adaptAnalysisTask<cascadeprefilter>("lf-cascadeprefilter"),
adaptAnalysisTask<cascadefinder>("lf-cascadefinder"),
adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer"),
adaptAnalysisTask<cascadefinderQA>("lf-cascadefinderQA")};
adaptAnalysisTask<cascadefinderQA>("lf-cascadefinderQA"),
adaptAnalysisTask<cascadeinitializer>("lf-cascadeinitializer")};
}
13 changes: 3 additions & 10 deletions Analysis/Tasks/PWGLF/lambdakzeroconsumer.cxx → Analysis/Tasks/PWGLF/lambdakzeroanalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct lambdakzeroQA {
}
};

struct lambdakzeroconsumer {
struct lambdakzeroanalysis {
OutputObj<TH3F> h3dMassK0Short{TH3F("h3dMassK0Short", "", 20, 0, 100, 200, 0, 10, 200, 0.450, 0.550)};
OutputObj<TH3F> h3dMassLambda{TH3F("h3dMassLambda", "", 20, 0, 100, 200, 0, 10, 200, 1.115 - 0.100, 1.115 + 0.100)};
OutputObj<TH3F> h3dMassAntiLambda{TH3F("h3dMassAntiLambda", "", 20, 0, 100, 200, 0, 10, 200, 1.115 - 0.100, 1.115 + 0.100)};
Expand Down Expand Up @@ -118,16 +118,9 @@ struct lambdakzeroconsumer {
}
};

/// Extends the v0data table with expression columns
struct lambdakzeroinitializer {
Spawns<aod::V0DataExt> v0dataext;
void init(InitContext const&) {}
};

WorkflowSpec defineDataProcessing(ConfigContext const&)
{
return WorkflowSpec{
adaptAnalysisTask<lambdakzeroconsumer>("lf-lambdakzeroconsumer"),
adaptAnalysisTask<lambdakzeroQA>("lf-lambdakzeroQA"),
adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer")};
adaptAnalysisTask<lambdakzeroanalysis>("lf-lambdakzeroanalysis"),
adaptAnalysisTask<lambdakzeroQA>("lf-lambdakzeroQA")};
}
15 changes: 11 additions & 4 deletions Analysis/Tasks/PWGLF/lambdakzeroproducer.cxx → Analysis/Tasks/PWGLF/lambdakzerobuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
//
// V0 Producer task
// V0 builder task
// ================
//
// This task loops over an *existing* list of V0s (neg/pos track
Expand All @@ -17,7 +17,7 @@
// Any analysis should loop over the "V0Data"
// table as that table contains all information
//
// WARNING: adding filters to the producer IS NOT
// WARNING: adding filters to the builder IS NOT
// equivalent to re-running the finders. This will only
// ever produce *tighter* selection sections. It is your
// responsibility to check if, by setting a loose filter
Expand Down Expand Up @@ -123,7 +123,7 @@ struct lambdakzeroprefilterpairs {
};

/// Cascade builder task: rebuilds cascades
struct lambdakzeroproducer {
struct lambdakzerobuilder {

Produces<aod::V0Data> v0data;

Expand Down Expand Up @@ -210,9 +210,16 @@ struct lambdakzeroproducer {
}
};

/// Extends the v0data table with expression columns
struct lambdakzeroinitializer {
Spawns<aod::V0DataExt> v0dataext;
void init(InitContext const&) {}
};

WorkflowSpec defineDataProcessing(ConfigContext const&)
{
return WorkflowSpec{
adaptAnalysisTask<lambdakzeroprefilterpairs>("lf-lambdakzeroprefilterpairs"),
adaptAnalysisTask<lambdakzeroproducer>("lf-lambdakzeroproducer")};
adaptAnalysisTask<lambdakzerobuilder>("lf-lambdakzerobuilder"),
adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer")};
}
4 changes: 2 additions & 2 deletions Analysis/Tasks/PWGLF/lambdakzerofinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
return WorkflowSpec{
adaptAnalysisTask<lambdakzeroprefilter>("lf-lambdakzeroprefilter"),
adaptAnalysisTask<lambdakzerofinder>("lf-lambdakzerofinder"),
adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer"),
adaptAnalysisTask<lambdakzerofinderQA>("lf-lambdakzerofinderQA")};
adaptAnalysisTask<lambdakzerofinderQA>("lf-lambdakzerofinderQA"),
adaptAnalysisTask<lambdakzeroinitializer>("lf-lambdakzeroinitializer")};
}