Skip to content

[PWGCF] Refresh naming convention of table producer #15620

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

Merged
wenyaCern merged 3 commits into from
Apr 2, 2026
Merged

[PWGCF] Refresh naming convention of table producer #15620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da2cbf7
Refresh Table name defintions
abmodak Apr 1, 2026
fee5195
Change table names
abmodak Apr 1, 2026
5fbd8af
Change the table names
abmodak Apr 1, 2026
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
96 changes: 48 additions & 48 deletions PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
DECLARE_SOA_COLUMN(GapSide, gapSide, uint8_t); // 0 for side A, 1 for side C, 2 for both sides
} // namespace lrcorrcolltable

DECLARE_SOA_TABLE(CollLRTables, "AOD", "COLLLRTABLE",
DECLARE_SOA_TABLE(LRCollisions, "AOD", "LRCOLLISION",
o2::soa::Index<>,
bc::RunNumber,
lrcorrcolltable::Zvtx,
lrcorrcolltable::Multiplicity,
lrcorrcolltable::Centrality,
timestamp::Timestamp);
using CollLRTable = CollLRTables::iterator;
using LRCollision = LRCollisions::iterator;

DECLARE_SOA_TABLE(UpcCollLRTables, "AOD", "UPCCOLLLRTABLE",
DECLARE_SOA_TABLE(UpcLRCollisions, "AOD", "UPCLRCOLLISION",
o2::soa::Index<>,
bc::GlobalBC,
bc::RunNumber,
Expand All @@ -52,30 +52,30 @@
lrcorrcolltable::TotalFT0AmplitudeA,
lrcorrcolltable::TotalFT0AmplitudeC,
lrcorrcolltable::TotalFV0AmplitudeA);
using UpcCollLRTable = UpcCollLRTables::iterator;
using UpcLRCollision = UpcLRCollisions::iterator;

DECLARE_SOA_TABLE(UpcSgCollLRTables, "AOD", "UPCSGCOLLLRTABLE",
DECLARE_SOA_TABLE(UpcSgLRCollisions, "AOD", "UPCSGLRCOLLISION",
lrcorrcolltable::GapSide);
using UpcSgCollLRTable = UpcSgCollLRTables::iterator;
using UpcSgLRCollision = UpcSgLRCollisions::iterator;

namespace lrcorrzdctable
{
DECLARE_SOA_INDEX_COLUMN(UpcCollLRTable, upcCollLRTable);
DECLARE_SOA_INDEX_COLUMN(UpcLRCollision, upcLRCollision);
DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float);
DECLARE_SOA_COLUMN(EnergyCommonZNC, energyCommonZNC, float);
} // namespace lrcorrzdctable

DECLARE_SOA_TABLE(ZdcLRTables, "AOD", "ZDCLRTABLE",
DECLARE_SOA_TABLE(LRZdcs, "AOD", "LRZDC",
o2::soa::Index<>,
lrcorrzdctable::UpcCollLRTableId,
lrcorrzdctable::UpcLRCollisionId,
lrcorrzdctable::EnergyCommonZNA,
lrcorrzdctable::EnergyCommonZNC);
using ZdcLRTable = ZdcLRTables::iterator;
using LRZdc = LRZdcs::iterator;

namespace lrcorrtrktable
{
DECLARE_SOA_INDEX_COLUMN(CollLRTable, collLRTable);
DECLARE_SOA_INDEX_COLUMN(UpcCollLRTable, upcCollLRTable);
DECLARE_SOA_INDEX_COLUMN(LRCollision, lrCollision);

Check failure on line 77 in PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_INDEX_COLUMN(UpcLRCollision, upcLRCollision);
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);
DECLARE_SOA_COLUMN(Phi, phi, float);
Expand All @@ -99,115 +99,115 @@
};
} // namespace lrcorrtrktable

DECLARE_SOA_TABLE(TrkLRTables, "AOD", "TRKLRTABLE",
DECLARE_SOA_TABLE(LRMidTracks, "AOD", "LRMIDTRACK",
o2::soa::Index<>,
lrcorrtrktable::CollLRTableId,
lrcorrtrktable::LRCollisionId,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi,
lrcorrtrktable::TrackType);
using TrkLRTable = TrkLRTables::iterator;
using LRMidTrack = LRMidTracks::iterator;

DECLARE_SOA_TABLE(Ft0aLRTables, "AOD", "FT0ALRTABLE",
DECLARE_SOA_TABLE(LRFt0aTracks, "AOD", "LRFT0ATRACK",
o2::soa::Index<>,
lrcorrtrktable::CollLRTableId,
lrcorrtrktable::LRCollisionId,
lrcorrtrktable::ChannelID,
lrcorrtrktable::Amplitude,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using Ft0aLRTable = Ft0aLRTables::iterator;
using LRFt0aTrack = LRFt0aTracks::iterator;

DECLARE_SOA_TABLE(Ft0cLRTables, "AOD", "FT0CLRTABLE",
DECLARE_SOA_TABLE(LRFt0cTracks, "AOD", "LRFT0CTRACK",
o2::soa::Index<>,
lrcorrtrktable::CollLRTableId,
lrcorrtrktable::LRCollisionId,
lrcorrtrktable::ChannelID,
lrcorrtrktable::Amplitude,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using Ft0cLRTable = Ft0cLRTables::iterator;
using LRFt0cTrack = LRFt0cTracks::iterator;

DECLARE_SOA_TABLE(V0TrkLRTables, "AOD", "V0TRKLRTABLE",
DECLARE_SOA_TABLE(LRV0Tracks, "AOD", "LRV0TRACK",
o2::soa::Index<>,
lrcorrtrktable::CollLRTableId,
lrcorrtrktable::LRCollisionId,
lrcorrtrktable::IdPos,
lrcorrtrktable::IdNeg,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi,
lrcorrtrktable::InvMass,
lrcorrtrktable::V0Type);
using V0TrkLRTable = V0TrkLRTables::iterator;
using LRV0Track = LRV0Tracks::iterator;

DECLARE_SOA_TABLE(MftTrkLRTables, "AOD", "MFTTRKLRTABLE",
DECLARE_SOA_TABLE(LRMftTracks, "AOD", "LRMFTTRACK",
o2::soa::Index<>,
lrcorrtrktable::CollLRTableId,
lrcorrtrktable::LRCollisionId,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using MftTrkLRTable = MftTrkLRTables::iterator;
using LRMftTrack = LRMftTracks::iterator;

DECLARE_SOA_TABLE(MftBestTrkLRTables, "AOD", "MFTBESTTRKLRTABLE",
DECLARE_SOA_TABLE(LRMftBestTracks, "AOD", "LRMFTBESTTRACK",
o2::soa::Index<>,
lrcorrtrktable::CollLRTableId,
lrcorrtrktable::LRCollisionId,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using MftBestTrkLRTable = MftBestTrkLRTables::iterator;
using LRMftBestTrack = LRMftBestTracks::iterator;

DECLARE_SOA_TABLE(TrkLRUpcTables, "AOD", "TRKLRUPCTABLE",
DECLARE_SOA_TABLE(UpcLRMidTracks, "AOD", "UPCLRMIDTRACK",
o2::soa::Index<>,
lrcorrtrktable::UpcCollLRTableId,
lrcorrtrktable::UpcLRCollisionId,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi,
lrcorrtrktable::TrackType);
using TrkLRUpcTable = TrkLRUpcTables::iterator;
using UpcLRMidTrack = UpcLRMidTracks::iterator;

DECLARE_SOA_TABLE(Ft0aLRUpcTables, "AOD", "FT0ALRUpcTABLE",
DECLARE_SOA_TABLE(UpcLRFt0aTracks, "AOD", "UPCLRFT0ATRACK",
o2::soa::Index<>,
lrcorrtrktable::UpcCollLRTableId,
lrcorrtrktable::UpcLRCollisionId,
lrcorrtrktable::ChannelID,
lrcorrtrktable::Amplitude,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using Ft0aLRUpcTable = Ft0aLRUpcTables::iterator;
using UpcLRFt0aTrack = UpcLRFt0aTracks::iterator;

DECLARE_SOA_TABLE(Ft0cLRUpcTables, "AOD", "FT0CLRUpcTABLE",
DECLARE_SOA_TABLE(UpcLRFt0cTracks, "AOD", "UPCLRFT0CTRACK",
o2::soa::Index<>,
lrcorrtrktable::UpcCollLRTableId,
lrcorrtrktable::UpcLRCollisionId,
lrcorrtrktable::ChannelID,
lrcorrtrktable::Amplitude,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using Ft0cLRUpcTable = Ft0cLRUpcTables::iterator;
using UpcLRFt0cTrack = UpcLRFt0cTracks::iterator;

DECLARE_SOA_TABLE(V0TrkLRUpcTables, "AOD", "V0TRKLRUPCTABLE",
DECLARE_SOA_TABLE(UpcLRV0Tracks, "AOD", "UPCLRV0TRACK",
o2::soa::Index<>,
lrcorrtrktable::UpcCollLRTableId,
lrcorrtrktable::UpcLRCollisionId,
lrcorrtrktable::IdPos,
lrcorrtrktable::IdNeg,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi,
lrcorrtrktable::InvMass,
lrcorrtrktable::V0Type);
using V0TrkLRUpcTable = V0TrkLRUpcTables::iterator;
using UpcLRV0Track = UpcLRV0Tracks::iterator;

DECLARE_SOA_TABLE(MftTrkLRUpcTables, "AOD", "MFTTRKLRUPCTABLE",
DECLARE_SOA_TABLE(UpcLRMftTracks, "AOD", "UPCLRMFTTRACK",
o2::soa::Index<>,
lrcorrtrktable::UpcCollLRTableId,
lrcorrtrktable::UpcLRCollisionId,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using MftTrkLRUpcTable = MftTrkLRUpcTables::iterator;
using UpcLRMftTrack = UpcLRMftTracks::iterator;

DECLARE_SOA_TABLE(MftBestTrkLRUpcTables, "AOD", "MFTBESTTRKLRUPCTABLE",
DECLARE_SOA_TABLE(UpcLRMftBestTracks, "AOD", "UPCLRMFTBESTTRACK",
o2::soa::Index<>,
lrcorrtrktable::UpcCollLRTableId,
lrcorrtrktable::UpcLRCollisionId,
lrcorrtrktable::Pt,
lrcorrtrktable::Eta,
lrcorrtrktable::Phi);
using MftBestTrkLRUpcTable = MftBestTrkLRUpcTables::iterator;
using UpcLRMftBestTrack = UpcLRMftBestTracks::iterator;

} // namespace o2::aod

Expand Down
Loading
Loading