Skip to content

Commit 5b08f2d

Browse files
aalkinalibuild
andauthored
Use staged macro (#8179)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent f4bc635 commit 5b08f2d

File tree

12 files changed

+581
-1373
lines changed

12 files changed

+581
-1373
lines changed

PWGDQ/DataModel/ReducedInfoTables.h

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,11 @@ DECLARE_SOA_COLUMN(M11REF, m11ref, float); //! Weighted multiplicity of <<2
110110
DECLARE_SOA_COLUMN(M1111REF, m1111ref, float); //! Weighted multiplicity of <<4>> for reference flow
111111
} // namespace reducedevent
112112

113-
DECLARE_SOA_TABLE(ReducedEvents, "AOD", "REDUCEDEVENT", //! Main event information table
114-
o2::soa::Index<>,
115-
reducedevent::Tag, bc::RunNumber,
116-
collision::PosX, collision::PosY, collision::PosZ, collision::NumContrib,
117-
collision::CollisionTime, collision::CollisionTimeRes);
118-
119-
DECLARE_SOA_TABLE(StoredReducedEvents, "AOD1", "REDUCEDEVENT", //! Main event information table
120-
o2::soa::Index<>,
121-
reducedevent::Tag, bc::RunNumber,
122-
collision::PosX, collision::PosY, collision::PosZ, collision::NumContrib,
123-
collision::CollisionTime, collision::CollisionTimeRes,
124-
o2::soa::Marker<1>);
113+
DECLARE_SOA_TABLE_STAGED(ReducedEvents, "REDUCEDEVENT", //! Main event information table
114+
o2::soa::Index<>,
115+
reducedevent::Tag, bc::RunNumber,
116+
collision::PosX, collision::PosY, collision::PosZ, collision::NumContrib,
117+
collision::CollisionTime, collision::CollisionTimeRes);
125118

126119
DECLARE_SOA_TABLE(ReducedEventsExtended, "AOD", "REEXTENDED", //! Extended event information
127120
bc::GlobalBC, evsel::Alias, evsel::Selection, timestamp::Timestamp, cent::CentRun2V0M,
@@ -699,28 +692,16 @@ DECLARE_SOA_DYNAMIC_COLUMN(Y, y, //!
699692
[](float pt, float eta, float m) -> float { return std::log((std::sqrt(m * m + pt * pt * std::cosh(eta) * std::cosh(eta)) + pt * std::sinh(eta)) / std::sqrt(m * m + pt * pt)); });
700693
} // namespace reducedpair
701694

702-
DECLARE_SOA_TABLE(Dielectrons, "AOD", "RTDIELECTRON", //!
703-
o2::soa::Index<>, reducedpair::ReducedEventId,
704-
reducedpair::Mass, reducedpair::Pt, reducedpair::Eta, reducedpair::Phi, reducedpair::Sign,
705-
reducedpair::FilterMap, reducedpair::McDecision,
706-
reducedpair::Rap<reducedpair::Pt, reducedpair::Eta, reducedpair::Mass>,
707-
reducedpair::Y<reducedpair::Pt, reducedpair::Eta, reducedpair::Mass>,
708-
reducedpair::Px<reducedpair::Pt, reducedpair::Phi>,
709-
reducedpair::Py<reducedpair::Pt, reducedpair::Phi>,
710-
reducedpair::Pz<reducedpair::Pt, reducedpair::Eta>,
711-
reducedpair::P<reducedpair::Pt, reducedpair::Eta>);
712-
713-
DECLARE_SOA_TABLE(StoredDielectrons, "AOD1", "RTDIELECTRON", //!
714-
o2::soa::Index<>, reducedpair::ReducedEventId,
715-
reducedpair::Mass, reducedpair::Pt, reducedpair::Eta, reducedpair::Phi, reducedpair::Sign,
716-
reducedpair::FilterMap, reducedpair::McDecision,
717-
reducedpair::Rap<reducedpair::Pt, reducedpair::Eta, reducedpair::Mass>,
718-
reducedpair::Y<reducedpair::Pt, reducedpair::Eta, reducedpair::Mass>,
719-
reducedpair::Px<reducedpair::Pt, reducedpair::Phi>,
720-
reducedpair::Py<reducedpair::Pt, reducedpair::Phi>,
721-
reducedpair::Pz<reducedpair::Pt, reducedpair::Eta>,
722-
reducedpair::P<reducedpair::Pt, reducedpair::Eta>,
723-
o2::soa::Marker<1>);
695+
DECLARE_SOA_TABLE_STAGED(Dielectrons, "RTDIELECTRON", //!
696+
o2::soa::Index<>, reducedpair::ReducedEventId,
697+
reducedpair::Mass, reducedpair::Pt, reducedpair::Eta, reducedpair::Phi, reducedpair::Sign,
698+
reducedpair::FilterMap, reducedpair::McDecision,
699+
reducedpair::Rap<reducedpair::Pt, reducedpair::Eta, reducedpair::Mass>,
700+
reducedpair::Y<reducedpair::Pt, reducedpair::Eta, reducedpair::Mass>,
701+
reducedpair::Px<reducedpair::Pt, reducedpair::Phi>,
702+
reducedpair::Py<reducedpair::Pt, reducedpair::Phi>,
703+
reducedpair::Pz<reducedpair::Pt, reducedpair::Eta>,
704+
reducedpair::P<reducedpair::Pt, reducedpair::Eta>);
724705

725706
DECLARE_SOA_TABLE(Dimuons, "AOD", "RTDIMUON", //!
726707
o2::soa::Index<>, reducedpair::ReducedEventId,

PWGHF/DataModel/DerivedTables.h

Lines changed: 275 additions & 273 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)