Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion PWGCF/FemtoDream/Tasks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,62 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2physics_add_dpl_workflow(femtodream-pair-track-track

Check failure on line 12 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-pair-track-track does not match its file name femtoDreamPairTaskTrackTrack.cxx. (Matches femtodreamPairTrackTrack.cxx.)
SOURCES femtoDreamPairTaskTrackTrack.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-triplet-track-track-track

Check failure on line 17 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-triplet-track-track-track does not match its file name femtoDreamTripletTaskTrackTrackTrack.cxx. (Matches femtodreamTripletTrackTrackTrack.cxx.)
SOURCES femtoDreamTripletTaskTrackTrackTrack.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femto-dream-triplet-task-track-track-track-pb-pb
SOURCES femtoDreamTripletTaskTrackTrackTrackPbPb.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

Comment on lines +23 to +26
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want your executable named as you said (femtodream-triplet-track-track-track-pb-pb), follow linter recommendation on how to name your source file

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not part of her PR, the PbPb track track track task was done a few months ago by my student. I would suggest that Wiola fix only the linter related to her task.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not part of her PR, the PbPb track track track task was done a few months ago by my student. I would suggest that Wiola fix only the linter related to her task.

But it is now when it enters in the build machinery so is the proper time for renaming it or rename the executable name if so is decided

o2physics_add_dpl_workflow(femtodream-pair-track-v0

Check failure on line 27 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-pair-track-v0 does not match its file name femtoDreamPairTaskTrackV0.cxx. (Matches femtodreamPairTrackV0.cxx.)
SOURCES femtoDreamPairTaskTrackV0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-pair-track-cascade

Check failure on line 32 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-pair-track-cascade does not match its file name femtoDreamPairTaskTrackCascade.cxx. (Matches femtodreamPairTrackCascade.cxx.)
SOURCES femtoDreamPairTaskTrackCascade.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-pair-casdcade-cascade

Check failure on line 37 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-pair-casdcade-cascade does not match its file name femtodreamPairCascadeCascade.cxx. (Matches femtodreamPairCasdcadeCascade.cxx.)
SOURCES femtodreamPairCascadeCascade.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-triplet-track-track-v0

Check failure on line 42 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-triplet-track-track-v0 does not match its file name femtoDreamTripletTaskTrackTrackV0.cxx. (Matches femtodreamTripletTrackTrackV0.cxx.)
SOURCES femtoDreamTripletTaskTrackTrackV0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femto-dream-triplet-task-track-track-v0-pb-pb
SOURCES femtoDreamTripletTaskTrackTrackV0PbPb.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

Comment on lines +48 to +51
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Although it seems this is a false positive or the linter getting out of sync @vkucera

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the linter wants a hyphen at every location, where the upper case letter is. So it might want the task to be called femto-dream if femtoDream is in the source name.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah sorry! I see now that Wiola's code is correct but the error message says different thing than the code. Indeed, @vkucera could you check please?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @wrzesaCERN , your branch is missing some changes made in #12820 . Please rebase your branch and update the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, could you please let me know if now is fine for you? I tried to rebase it

I don’t see any issue with “femto-dream-triplet-task-track-track-v0-pb-pb” in the CMakeLists, but I also have not seen that before in the output of that linear check. So maybe I’m simply not looking in the right place.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, femto-dream-triplet-task-track-track-v0-pb-pb is correct.

o2physics_add_dpl_workflow(femtodream-debug-track

Check failure on line 52 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-debug-track does not match its file name femtoDreamDebugTrack.cxx. (Matches femtodreamDebugTrack.cxx.)
SOURCES femtoDreamDebugTrack.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-debug-v0

Check failure on line 57 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-debug-v0 does not match its file name femtoDreamDebugV0.cxx. (Matches femtodreamDebugV0.cxx.)
SOURCES femtoDreamDebugV0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-debug-cascade

Check failure on line 62 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-debug-cascade does not match its file name femtoDreamDebugCascade.cxx. (Matches femtodreamDebugCascade.cxx.)
SOURCES femtoDreamDebugCascade.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-collision-masker

Check failure on line 67 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name femtodream-collision-masker does not match its file name femtoDreamCollisionMasker.cxx. (Matches femtodreamCollisionMasker.cxx.)
SOURCES femtoDreamCollisionMasker.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand All @@ -67,4 +77,4 @@
o2physics_add_dpl_workflow(femtodream-pair-v0-v0
SOURCES femtoDreamPairTaskV0V0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
COMPONENT_NAME Analysis)
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ struct femoDreamCollisionMasker {
TrackDCACutPtDep.push_back(option.defaultValue.get<bool>());
}
}
} else if (device.name.find("femto-dream-triplet-task-track-track-v0") != std::string::npos) {
} else if ((device.name.find("femto-dream-triplet-task-track-track-v0") != std::string::npos) || (device.name.find("femto-dream-triplet-task-track-track-v0-pb-pb") != std::string::npos)) {
LOG(info) << "Matched workflow: " << device.name;
TaskFinder = CollisionMasks::kTrackTrackV0;
for (auto const& option : device.options) {
Expand Down
Loading
Loading