Skip to content

Commit 92fbdf2

Browse files
author
Yiping Wang
committed
resolve conflict
1 parent 136cfe1 commit 92fbdf2

File tree

1 file changed

+44
-46
lines changed

1 file changed

+44
-46
lines changed

‎PWGDQ/DataModel/ReducedInfoTables.h‎

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -675,52 +675,50 @@ DECLARE_SOA_COLUMN(DeviationxyTrk1KF, deviationxyTrk1KF, float); //! 2D chi2 dev
675675
// pair information
676676
namespace reducedpair
677677
{
678-
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
679-
DECLARE_SOA_INDEX_COLUMN_FULL(Index0, index0, int, ReducedTracks, "_0"); //! Index to first prong
680-
DECLARE_SOA_INDEX_COLUMN_FULL(Index1, index1, int, ReducedTracks, "_1"); //! Index to second prong
681-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, Tracks, "_0"); //! Index of first prong in Tracks table
682-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, Tracks, "_1"); //! Index of second prong in Tracks table
683-
DECLARE_SOA_BITMAP_COLUMN(EventSelection, evSelection, 8); //! Event selection bits (ambiguity, splitting candidate)
684-
DECLARE_SOA_COLUMN(Mass, mass, float); //!
685-
DECLARE_SOA_COLUMN(Pt, pt, float); //!
686-
DECLARE_SOA_COLUMN(Eta, eta, float); //!
687-
DECLARE_SOA_COLUMN(Phi, phi, float); //!
688-
DECLARE_SOA_COLUMN(Sign, sign, int); //!
689-
DECLARE_SOA_BITMAP_COLUMN(FilterMap, filterMap, 32); //!
690-
DECLARE_SOA_BITMAP_COLUMN(PairFilterMap, pairFilterMap, 32); //!
691-
DECLARE_SOA_BITMAP_COLUMN(CommonFilterMap, commonFilterMap, 32); //!
692-
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //!
693-
DECLARE_SOA_COLUMN(Tauz, tauz, float); //! Longitudinal pseudo-proper time of lepton pair (in ns)
694-
DECLARE_SOA_COLUMN(TauzErr, tauzErr, float); //! Error on longitudinal pseudo-proper time of lepton pair (in ns)
695-
DECLARE_SOA_COLUMN(VertexPz, vertexPz, float); //! Longitudinal projection of impulsion
696-
DECLARE_SOA_COLUMN(SVertex, sVertex, float); //! Secondary vertex of lepton pair
697-
DECLARE_SOA_COLUMN(Tauxy, tauxy, float); //! Transverse pseudo-proper time of lepton pair (in ns)
698-
DECLARE_SOA_COLUMN(TauxyErr, tauxyErr, float); //! Error on transverse pseudo-proper time of lepton pair (in ns)
699-
DECLARE_SOA_COLUMN(Lz, lz, float); //! Longitudinal projection of decay length
700-
DECLARE_SOA_COLUMN(Lxy, lxy, float); //! Transverse projection of decay length
701-
DECLARE_SOA_COLUMN(Chi2pca, chi2pca, float); //! Chi2 for PCA of the dilepton
702-
DECLARE_SOA_COLUMN(CosPointingAngle, cosPointingAngle, float); //! Cosine of the pointing angle
703-
DECLARE_SOA_COLUMN(U2Q2, u2q2, float); //! Scalar product between unitary vector with event flow vector (harmonic 2)
704-
DECLARE_SOA_COLUMN(U3Q3, u3q3, float); //! Scalar product between unitary vector with event flow vector (harmonic 3)
705-
DECLARE_SOA_COLUMN(Cos2DeltaPhi, cos2deltaphi, float); //! Cosinus term using event plane angle (harmonic 2)
706-
DECLARE_SOA_COLUMN(Cos3DeltaPhi, cos3deltaphi, float); //! Cosinus term using event plane angle (harmonic 3)
707-
DECLARE_SOA_COLUMN(R2SP_AB, r2spab, float); //! Event plane resolution for SP method n=2 (A,B) TPC-FT0A
708-
DECLARE_SOA_COLUMN(R2SP_AC, r2spac, float); //! Event plane resolution for SP method n=2 (A,C) TPC-FT0C
709-
DECLARE_SOA_COLUMN(R2SP_BC, r2spbc, float); //! Event plane resolution for SP method n=2 (B,C) FT0A-FT0C
710-
DECLARE_SOA_COLUMN(R3SP, r3sp, float); //! Event plane resolution for SP method n=3
711-
DECLARE_SOA_COLUMN(R2EP, r2ep, float); //! Event plane resolution for EP method n=2
712-
DECLARE_SOA_COLUMN(R2EP_AB, r2epab, float); //! Event plane resolution for EP method n=2 (A,B) TPC-FT0A
713-
DECLARE_SOA_COLUMN(R2EP_AC, r2epac, float); //! Event plane resolution for EP method n=2 (A,C) TPC-FT0C
714-
DECLARE_SOA_COLUMN(R2EP_BC, r2epbc, float); //! Event plane resolution for EP method n=2 (B,C) FT0A-FT0C
715-
DECLARE_SOA_COLUMN(R3EP, r3ep, float); //! Event plane resolution for EP method n=3
716-
DECLARE_SOA_COLUMN(CORR2POI, corr2poi, float); //! POI FLOW CORRELATOR <2'>
717-
DECLARE_SOA_COLUMN(CORR4POI, corr4poi, float); //! POI FLOW CORRELATOR <4'>
718-
DECLARE_SOA_COLUMN(M01POI, m01poi, float); //! POI event weight for <2'>
719-
DECLARE_SOA_COLUMN(M0111POI, m0111poi, float); //! POI event weight for <4'>
720-
DECLARE_SOA_COLUMN(MultDimuons, multdimuons, int); //! Dimuon multiplicity
721-
DECLARE_SOA_COLUMN(CentFT0C, centft0c, float); //! Centrality information from FT0C
722-
// DECLARE_SOA_COLUMN(CentFT0A, centft0a, float); //! Centrality information from FT0A
723-
// DECLARE_SOA_COLUMN(CentFT0M, centft0m, float); //! Centrality information from FT0M
678+
DECLARE_SOA_INDEX_COLUMN(ReducedEvent, reducedevent); //!
679+
DECLARE_SOA_INDEX_COLUMN_FULL(Index0, index0, int, ReducedTracks, "_0"); //! Index to first prong
680+
DECLARE_SOA_INDEX_COLUMN_FULL(Index1, index1, int, ReducedTracks, "_1"); //! Index to second prong
681+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, Tracks, "_0"); //! Index of first prong in Tracks table
682+
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, Tracks, "_1"); //! Index of second prong in Tracks table
683+
DECLARE_SOA_BITMAP_COLUMN(EventSelection, evSelection, 8); //! Event selection bits (ambiguity, splitting candidate)
684+
DECLARE_SOA_COLUMN(Mass, mass, float); //!
685+
DECLARE_SOA_COLUMN(Pt, pt, float); //!
686+
DECLARE_SOA_COLUMN(Eta, eta, float); //!
687+
DECLARE_SOA_COLUMN(Phi, phi, float); //!
688+
DECLARE_SOA_COLUMN(Sign, sign, int); //!
689+
DECLARE_SOA_BITMAP_COLUMN(FilterMap, filterMap, 32); //!
690+
DECLARE_SOA_BITMAP_COLUMN(PairFilterMap, pairFilterMap, 32); //!
691+
DECLARE_SOA_BITMAP_COLUMN(CommonFilterMap, commonFilterMap, 32); //!
692+
DECLARE_SOA_COLUMN(McDecision, mcDecision, uint32_t); //!
693+
DECLARE_SOA_COLUMN(Tauz, tauz, float); //! Longitudinal pseudo-proper time of lepton pair (in ns)
694+
DECLARE_SOA_COLUMN(TauzErr, tauzErr, float); //! Error on longitudinal pseudo-proper time of lepton pair (in ns)
695+
DECLARE_SOA_COLUMN(VertexPz, vertexPz, float); //! Longitudinal projection of impulsion
696+
DECLARE_SOA_COLUMN(SVertex, sVertex, float); //! Secondary vertex of lepton pair
697+
DECLARE_SOA_COLUMN(Tauxy, tauxy, float); //! Transverse pseudo-proper time of lepton pair (in ns)
698+
DECLARE_SOA_COLUMN(TauxyErr, tauxyErr, float); //! Error on transverse pseudo-proper time of lepton pair (in ns)
699+
DECLARE_SOA_COLUMN(Lz, lz, float); //! Longitudinal projection of decay length
700+
DECLARE_SOA_COLUMN(Lxy, lxy, float); //! Transverse projection of decay length
701+
DECLARE_SOA_COLUMN(Chi2pca, chi2pca, float); //! Chi2 for PCA of the dilepton
702+
DECLARE_SOA_COLUMN(CosPointingAngle, cosPointingAngle, float); //! Cosine of the pointing angle
703+
DECLARE_SOA_COLUMN(U2Q2, u2q2, float); //! Scalar product between unitary vector with event flow vector (harmonic 2)
704+
DECLARE_SOA_COLUMN(U3Q3, u3q3, float); //! Scalar product between unitary vector with event flow vector (harmonic 3)
705+
DECLARE_SOA_COLUMN(Cos2DeltaPhi, cos2deltaphi, float); //! Cosinus term using event plane angle (harmonic 2)
706+
DECLARE_SOA_COLUMN(Cos3DeltaPhi, cos3deltaphi, float); //! Cosinus term using event plane angle (harmonic 3)
707+
DECLARE_SOA_COLUMN(R2SP_AB, r2spab, float); //! Event plane resolution for SP method n=2 (A,B) TPC-FT0A
708+
DECLARE_SOA_COLUMN(R2SP_AC, r2spac, float); //! Event plane resolution for SP method n=2 (A,C) TPC-FT0C
709+
DECLARE_SOA_COLUMN(R2SP_BC, r2spbc, float); //! Event plane resolution for SP method n=2 (B,C) FT0A-FT0C
710+
DECLARE_SOA_COLUMN(R3SP, r3sp, float); //! Event plane resolution for SP method n=3
711+
DECLARE_SOA_COLUMN(R2EP, r2ep, float); //! Event plane resolution for EP method n=2
712+
DECLARE_SOA_COLUMN(R2EP_AB, r2epab, float); //! Event plane resolution for EP method n=2 (A,B) TPC-FT0A
713+
DECLARE_SOA_COLUMN(R2EP_AC, r2epac, float); //! Event plane resolution for EP method n=2 (A,C) TPC-FT0C
714+
DECLARE_SOA_COLUMN(R2EP_BC, r2epbc, float); //! Event plane resolution for EP method n=2 (B,C) FT0A-FT0C
715+
DECLARE_SOA_COLUMN(R3EP, r3ep, float); //! Event plane resolution for EP method n=3
716+
DECLARE_SOA_COLUMN(CORR2POI, corr2poi, float); //! POI FLOW CORRELATOR <2'>
717+
DECLARE_SOA_COLUMN(CORR4POI, corr4poi, float); //! POI FLOW CORRELATOR <4'>
718+
DECLARE_SOA_COLUMN(M01POI, m01poi, float); //! POI event weight for <2'>
719+
DECLARE_SOA_COLUMN(M0111POI, m0111poi, float); //! POI event weight for <4'>
720+
DECLARE_SOA_COLUMN(MultDimuons, multdimuons, int); //! Dimuon multiplicity
721+
DECLARE_SOA_COLUMN(CentFT0C, centft0c, float); //! Centrality information from FT0C
724722
DECLARE_SOA_COLUMN(CollisionId, collisionId, int32_t); //!
725723
DECLARE_SOA_COLUMN(IsFirst, isfirst, int); //! Flag for the first dilepton in the collision
726724
DECLARE_SOA_COLUMN(DCAxyzBetweenTrksKF, dcaxyzbetweentrksKF, float); //! DCAxyz between the two tracks

0 commit comments

Comments
 (0)