Skip to content

Commit 3fbf370

Browse files
authored
Update AnalysisDataModel.h
1 parent 6f6d2f4 commit 3fbf370

File tree

1 file changed

+25
-13
lines changed

1 file changed

+25
-13
lines changed

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,19 +1747,6 @@ DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t); //! V0A tr
17471747
DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t); //! V0C trigger charge
17481748
DECLARE_SOA_COLUMN(NTPCClusters, nTPCClusters, uint32_t); //! total number of TPC clusters (for ev sel)
17491749
DECLARE_SOA_COLUMN(NSDDSSDClusters, nSDDSSDClusters, uint32_t); //! total number of SSD + SDD clusters (for ev sel)
1750-
DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position
1751-
DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position
1752-
DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position
1753-
DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC
1754-
DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron
1755-
DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV
1756-
DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells
1757-
DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number
1758-
DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation
1759-
DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation
1760-
DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width
1761-
DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width
1762-
DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV
17631750
namespace oftv0
17641751
{
17651752
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
@@ -1780,6 +1767,23 @@ DECLARE_SOA_COLUMN(DCAr, dcaR, float); //! DCA
17801767
DECLARE_SOA_COLUMN(DCAz, dcaZ, float); //! DCA in z direction
17811768
DECLARE_SOA_COLUMN(Mass, mass, float); //! mass of the conversion. Do NOT use for cut!
17821769
} // namespace oftv0
1770+
namespace pmd
1771+
{
1772+
DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index
1773+
DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position
1774+
DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position
1775+
DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position
1776+
DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC
1777+
DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron
1778+
DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV
1779+
DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells
1780+
DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number
1781+
DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation
1782+
DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation
1783+
DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width
1784+
DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width
1785+
DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV
1786+
} // namespace pmd
17831787
} // namespace run2
17841788

17851789
DECLARE_SOA_TABLE(Run2BCInfos_000, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy information for Run 2 event selection
@@ -1816,6 +1820,14 @@ DECLARE_SOA_TABLE(Run2OTFV0s, "AOD", "Run2OTFV0", //! Run 2 V0 on the fly table
18161820

18171821
using Run2OTFV0 = Run2OTFV0s::iterator;
18181822

1823+
DECLARE_SOA_TABLE(Pmds, "AOD", "PMD", //! Photon information from PMD detector
1824+
o2::soa::Index<>, run2::pmd::BCId, run2::pmd::X, run2::pmd::Y,
1825+
run2::pmd::Z, run2::pmd::CluADC, run2::pmd::CluPID, run2::pmd::Det,
1826+
run2::pmd::Ncell, run2::pmd::Smn, run2::pmd::TrackNo, run2::pmd::TrackPid,
1827+
run2::pmd::SigX, run2::pmd::SigY, run2::pmd::ClMatching);
1828+
1829+
using Pmd = Pmds::iterator;
1830+
18191831
// ---- MC tables ----
18201832
namespace mccollision
18211833
{

0 commit comments

Comments
 (0)