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

[PWGJE,Trigger] Fix scope of tables in Jet.h #8046

Merged
merged 5 commits into from
Oct 26, 2024
Merged

[PWGJE,Trigger] Fix scope of tables in Jet.h #8046

merged 5 commits into from
Oct 26, 2024
+728 −723

Conversation

vkucera
Copy link
Collaborator

@vkucera vkucera commented Oct 18, 2024 •
edited
Loading

  • Move declarations of jet tables and definitions of table macros from the global scope to the o2::aod namespace.
  • Undefine macros after use.

@github-actions github-actions bot added the pwgje label Oct 18, 2024
@alibuild alibuild mentioned this pull request Oct 18, 2024
Merged
@alibuild alibuild mentioned this pull request Oct 20, 2024
Merged
@vkucera vkucera marked this pull request as ready for review October 20, 2024 16:08
mpuccio
mpuccio previously approved these changes Oct 21, 2024
View reviewed changes
nzardosh
nzardosh previously approved these changes Oct 24, 2024
View reviewed changes
PWGJE/DataModel/Jet.h
@@ -190,51 +187,60 @@ DECLARE_JET_TABLES_LEVELS(DielectronCharged, JTrackSub, Dielectrons, JDielectron
// duplicate jet tables (added as needed for analyses)
DECLARE_JET_DUPLICATE_TABLES_LEVELS(Charged, JTrackSub, HfD0Bases, HfD0PBases, "C", 1);

} // namespace o2::aod
#undef DECLARE_JET_TABLE
Copy link
Collaborator

Choose a reason for hiding this comment

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

what do these do?

Copy link
Collaborator Author

@vkucera vkucera Oct 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

They undefine the macros so that they don't exist below that line.
See https://rawgit.com/AliceO2Group/CodingGuidelines/master/coding_guidelines.html?showone=Preprocessor_Macros#Preprocessor_Macros

@vkucera vkucera dismissed stale reviews from nzardosh and mpuccio via f00307d October 24, 2024 13:35
@vkucera vkucera changed the title PWGJE: Fix scope of tables in Jet.h [PWGJE,Trigger] Fix scope of tables in Jet.h Oct 25, 2024
@nzardosh nzardosh merged commit c76d431 into AliceO2Group:master Oct 26, 2024
11 checks passed
@vkucera vkucera deleted the je-namespace branch October 26, 2024 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nzardosh nzardosh nzardosh approved these changes

@alibuild alibuild Awaiting requested review from alibuild alibuild is a code owner

@maoyx maoyx Awaiting requested review from maoyx maoyx is a code owner

@ddobrigk ddobrigk Awaiting requested review from ddobrigk ddobrigk is a code owner

@mfasDa mfasDa Awaiting requested review from mfasDa mfasDa is a code owner

@fkrizek fkrizek Awaiting requested review from fkrizek fkrizek is a code owner

@lietava lietava Awaiting requested review from lietava lietava is a code owner

@mpuccio mpuccio Awaiting requested review from mpuccio mpuccio is a code owner

Assignees
No one assigned
Labels
pwgje trigger
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vkucera @mpuccio @nzardosh @alibuild