From 5ae885e2662522061f240ebe1c05a8de701a2505 Mon Sep 17 00:00:00 2001 From: abmodak <67369858+abmodak@users.noreply.github.com> Date: Fri, 21 Feb 2025 23:30:28 +0100 Subject: [PATCH 1/7] Add PMD info to AO2Ds --- .../include/Framework/AnalysisDataModel.h | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 8c9f323f3dcc6..2697ebc039f0c 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1136,6 +1136,32 @@ DECLARE_SOA_TABLE(CPVClusters, "AOD", "CPVCLUSTER", //! CPV clusters cpvcluster::ModuleNumber, cpvcluster::IsUnfolded); using CPVCluster = CPVClusters::iterator; +namespace pmd +{ +DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index +DECLARE_SOA_COLUMN(X, clsx, float); //! cluster x position +DECLARE_SOA_COLUMN(Y, clsy, float); //! cluster y position +DECLARE_SOA_COLUMN(Z, clsz, float); //! cluster z position +DECLARE_SOA_COLUMN(CluADC, clsadc, float); //! cluster energy in ADC +DECLARE_SOA_COLUMN(CluPID, clspid, float); //! cluster probability, 1: photon, 0:hadron +DECLARE_SOA_COLUMN(Det, det, uint8_t); //! Detector, 0:PRE, 1:CPV +DECLARE_SOA_COLUMN(Ncell, ncell, uint8_t); //! cluster cells +DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number +DECLARE_SOA_COLUMN(TrackNo, trackno, int32_t); //! Track number assigned to clus from simulation +DECLARE_SOA_COLUMN(TrackPid, trackpid, int32_t); //! Track PID assigned to clus from simulation +DECLARE_SOA_COLUMN(SigX, sigx, float); //! Cluster x-width +DECLARE_SOA_COLUMN(SigY, sigy, float); //! Cluster y-width +DECLARE_SOA_COLUMN(ClMatching, clmatching, int32_t); //! Cluster of PRE matching with CPV +} // namespace pmd + +DECLARE_SOA_TABLE(Pmds, "AOD", "PMD", //! Photon information from PMD detector + o2::soa::Index<>, pmd::BCId, pmd::X, pmd::Y, + pmd::Z, pmd::CluADC, pmd::CluPID, pmd::Det, + pmd::Ncell, pmd::Smn, pmd::TrackNo, pmd::TrackPid, + pmd::SigX, pmd::SigY, pmd::ClMatching); +using Pmd = Pmds::iterator; + + namespace zdc { DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index, to be used by both legacy and new table From ff796d48204ef42f8a8d365d167d9cbc7bfae05f Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 21 Feb 2025 22:38:41 +0000 Subject: [PATCH 2/7] Please consider the following formatting changes --- .../include/Framework/AnalysisDataModel.h | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 2697ebc039f0c..2ba5f1cfbb728 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1138,30 +1138,29 @@ using CPVCluster = CPVClusters::iterator; namespace pmd { -DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index -DECLARE_SOA_COLUMN(X, clsx, float); //! cluster x position -DECLARE_SOA_COLUMN(Y, clsy, float); //! cluster y position -DECLARE_SOA_COLUMN(Z, clsz, float); //! cluster z position -DECLARE_SOA_COLUMN(CluADC, clsadc, float); //! cluster energy in ADC -DECLARE_SOA_COLUMN(CluPID, clspid, float); //! cluster probability, 1: photon, 0:hadron -DECLARE_SOA_COLUMN(Det, det, uint8_t); //! Detector, 0:PRE, 1:CPV -DECLARE_SOA_COLUMN(Ncell, ncell, uint8_t); //! cluster cells -DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number -DECLARE_SOA_COLUMN(TrackNo, trackno, int32_t); //! Track number assigned to clus from simulation -DECLARE_SOA_COLUMN(TrackPid, trackpid, int32_t); //! Track PID assigned to clus from simulation -DECLARE_SOA_COLUMN(SigX, sigx, float); //! Cluster x-width -DECLARE_SOA_COLUMN(SigY, sigy, float); //! Cluster y-width +DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index +DECLARE_SOA_COLUMN(X, clsx, float); //! cluster x position +DECLARE_SOA_COLUMN(Y, clsy, float); //! cluster y position +DECLARE_SOA_COLUMN(Z, clsz, float); //! cluster z position +DECLARE_SOA_COLUMN(CluADC, clsadc, float); //! cluster energy in ADC +DECLARE_SOA_COLUMN(CluPID, clspid, float); //! cluster probability, 1: photon, 0:hadron +DECLARE_SOA_COLUMN(Det, det, uint8_t); //! Detector, 0:PRE, 1:CPV +DECLARE_SOA_COLUMN(Ncell, ncell, uint8_t); //! cluster cells +DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number +DECLARE_SOA_COLUMN(TrackNo, trackno, int32_t); //! Track number assigned to clus from simulation +DECLARE_SOA_COLUMN(TrackPid, trackpid, int32_t); //! Track PID assigned to clus from simulation +DECLARE_SOA_COLUMN(SigX, sigx, float); //! Cluster x-width +DECLARE_SOA_COLUMN(SigY, sigy, float); //! Cluster y-width DECLARE_SOA_COLUMN(ClMatching, clmatching, int32_t); //! Cluster of PRE matching with CPV } // namespace pmd DECLARE_SOA_TABLE(Pmds, "AOD", "PMD", //! Photon information from PMD detector - o2::soa::Index<>, pmd::BCId, pmd::X, pmd::Y, - pmd::Z, pmd::CluADC, pmd::CluPID, pmd::Det, - pmd::Ncell, pmd::Smn, pmd::TrackNo, pmd::TrackPid, - pmd::SigX, pmd::SigY, pmd::ClMatching); + o2::soa::Index<>, pmd::BCId, pmd::X, pmd::Y, + pmd::Z, pmd::CluADC, pmd::CluPID, pmd::Det, + pmd::Ncell, pmd::Smn, pmd::TrackNo, pmd::TrackPid, + pmd::SigX, pmd::SigY, pmd::ClMatching); using Pmd = Pmds::iterator; - namespace zdc { DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index, to be used by both legacy and new table From 761bd4172ebed07b989af69e97136cfc1bed2324 Mon Sep 17 00:00:00 2001 From: abmodak <67369858+abmodak@users.noreply.github.com> Date: Fri, 11 Apr 2025 12:35:43 +0200 Subject: [PATCH 3/7] Update AnalysisDataModel.h Changes are done based on suggestions from Jan Fiete --- .../include/Framework/AnalysisDataModel.h | 43 ++++++++----------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 2ba5f1cfbb728..a213215d6e4ea 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1136,31 +1136,6 @@ DECLARE_SOA_TABLE(CPVClusters, "AOD", "CPVCLUSTER", //! CPV clusters cpvcluster::ModuleNumber, cpvcluster::IsUnfolded); using CPVCluster = CPVClusters::iterator; -namespace pmd -{ -DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index -DECLARE_SOA_COLUMN(X, clsx, float); //! cluster x position -DECLARE_SOA_COLUMN(Y, clsy, float); //! cluster y position -DECLARE_SOA_COLUMN(Z, clsz, float); //! cluster z position -DECLARE_SOA_COLUMN(CluADC, clsadc, float); //! cluster energy in ADC -DECLARE_SOA_COLUMN(CluPID, clspid, float); //! cluster probability, 1: photon, 0:hadron -DECLARE_SOA_COLUMN(Det, det, uint8_t); //! Detector, 0:PRE, 1:CPV -DECLARE_SOA_COLUMN(Ncell, ncell, uint8_t); //! cluster cells -DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number -DECLARE_SOA_COLUMN(TrackNo, trackno, int32_t); //! Track number assigned to clus from simulation -DECLARE_SOA_COLUMN(TrackPid, trackpid, int32_t); //! Track PID assigned to clus from simulation -DECLARE_SOA_COLUMN(SigX, sigx, float); //! Cluster x-width -DECLARE_SOA_COLUMN(SigY, sigy, float); //! Cluster y-width -DECLARE_SOA_COLUMN(ClMatching, clmatching, int32_t); //! Cluster of PRE matching with CPV -} // namespace pmd - -DECLARE_SOA_TABLE(Pmds, "AOD", "PMD", //! Photon information from PMD detector - o2::soa::Index<>, pmd::BCId, pmd::X, pmd::Y, - pmd::Z, pmd::CluADC, pmd::CluPID, pmd::Det, - pmd::Ncell, pmd::Smn, pmd::TrackNo, pmd::TrackPid, - pmd::SigX, pmd::SigY, pmd::ClMatching); -using Pmd = Pmds::iterator; - namespace zdc { DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index, to be used by both legacy and new table @@ -1772,6 +1747,19 @@ DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t); //! V0A tr DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t); //! V0C trigger charge DECLARE_SOA_COLUMN(NTPCClusters, nTPCClusters, uint32_t); //! total number of TPC clusters (for ev sel) DECLARE_SOA_COLUMN(NSDDSSDClusters, nSDDSSDClusters, uint32_t); //! total number of SSD + SDD clusters (for ev sel) +DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position +DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position +DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position +DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC +DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron +DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV +DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells +DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number +DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation +DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation +DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width +DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width +DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV namespace oftv0 { DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index @@ -1808,7 +1796,10 @@ DECLARE_SOA_TABLE_VERSIONED(Run2BCInfos_001, "AOD", "RUN2BCINFO", 1, run2::SPDFiredChipsL0, run2::SPDFiredChipsL1, run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1, run2::V0TriggerChargeA, run2::V0TriggerChargeC, - run2::NTPCClusters, run2::NSDDSSDClusters); + run2::NTPCClusters, run2::NSDDSSDClusters, + run2::X, run2::Y, run2::Z, run2::CluADC, run2::CluPID, + run2::Det, run2::Ncell, run2::Smn, run2::TrackNo, + run2::TrackPid, run2::SigX, run2::SigY, run2::ClMatching); using Run2BCInfos = Run2BCInfos_001; using Run2BCInfo = Run2BCInfos::iterator; From c39ff5368d7a0ad5c0f89bdfa2397fc88dcb4194 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 11 Apr 2025 10:36:15 +0000 Subject: [PATCH 4/7] Please consider the following formatting changes --- .../include/Framework/AnalysisDataModel.h | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index a213215d6e4ea..de65ebaf2e8ea 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1747,19 +1747,19 @@ DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t); //! V0A tr DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t); //! V0C trigger charge DECLARE_SOA_COLUMN(NTPCClusters, nTPCClusters, uint32_t); //! total number of TPC clusters (for ev sel) DECLARE_SOA_COLUMN(NSDDSSDClusters, nSDDSSDClusters, uint32_t); //! total number of SSD + SDD clusters (for ev sel) -DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position -DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position -DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position -DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC -DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron -DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV -DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells -DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number -DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation -DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation -DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width -DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width -DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV +DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position +DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position +DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position +DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC +DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron +DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV +DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells +DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number +DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation +DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation +DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width +DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width +DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV namespace oftv0 { DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index @@ -1797,8 +1797,8 @@ DECLARE_SOA_TABLE_VERSIONED(Run2BCInfos_001, "AOD", "RUN2BCINFO", 1, run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1, run2::V0TriggerChargeA, run2::V0TriggerChargeC, run2::NTPCClusters, run2::NSDDSSDClusters, - run2::X, run2::Y, run2::Z, run2::CluADC, run2::CluPID, - run2::Det, run2::Ncell, run2::Smn, run2::TrackNo, + run2::X, run2::Y, run2::Z, run2::CluADC, run2::CluPID, + run2::Det, run2::Ncell, run2::Smn, run2::TrackNo, run2::TrackPid, run2::SigX, run2::SigY, run2::ClMatching); using Run2BCInfos = Run2BCInfos_001; From 3fbf3705c87ba91014e6133c11e7c8c9d0d01db7 Mon Sep 17 00:00:00 2001 From: abmodak <67369858+abmodak@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:14:16 +0200 Subject: [PATCH 5/7] Update AnalysisDataModel.h --- .../include/Framework/AnalysisDataModel.h | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index de65ebaf2e8ea..bb49eb5b33a46 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1747,19 +1747,6 @@ DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t); //! V0A tr DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t); //! V0C trigger charge DECLARE_SOA_COLUMN(NTPCClusters, nTPCClusters, uint32_t); //! total number of TPC clusters (for ev sel) DECLARE_SOA_COLUMN(NSDDSSDClusters, nSDDSSDClusters, uint32_t); //! total number of SSD + SDD clusters (for ev sel) -DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position -DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position -DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position -DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC -DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron -DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV -DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells -DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number -DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation -DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation -DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width -DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width -DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV namespace oftv0 { DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index @@ -1780,6 +1767,23 @@ DECLARE_SOA_COLUMN(DCAr, dcaR, float); //! DCA DECLARE_SOA_COLUMN(DCAz, dcaZ, float); //! DCA in z direction DECLARE_SOA_COLUMN(Mass, mass, float); //! mass of the conversion. Do NOT use for cut! } // namespace oftv0 +namespace pmd +{ +DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index +DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position +DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position +DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position +DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC +DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron +DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV +DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells +DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number +DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation +DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation +DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width +DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width +DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV +} // namespace pmd } // namespace run2 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 using Run2OTFV0 = Run2OTFV0s::iterator; +DECLARE_SOA_TABLE(Pmds, "AOD", "PMD", //! Photon information from PMD detector + o2::soa::Index<>, run2::pmd::BCId, run2::pmd::X, run2::pmd::Y, + run2::pmd::Z, run2::pmd::CluADC, run2::pmd::CluPID, run2::pmd::Det, + run2::pmd::Ncell, run2::pmd::Smn, run2::pmd::TrackNo, run2::pmd::TrackPid, + run2::pmd::SigX, run2::pmd::SigY, run2::pmd::ClMatching); + +using Pmd = Pmds::iterator; + // ---- MC tables ---- namespace mccollision { From 6a6ea704924378b6c0a7ebe0d150d240ba1256c0 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 14 Apr 2025 08:14:55 +0000 Subject: [PATCH 6/7] Please consider the following formatting changes --- .../include/Framework/AnalysisDataModel.h | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index bb49eb5b33a46..b50d4237c3479 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1769,19 +1769,19 @@ DECLARE_SOA_COLUMN(Mass, mass, float); //! mass } // namespace oftv0 namespace pmd { -DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index -DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position -DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position -DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position -DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC -DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron -DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV -DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells -DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number -DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation -DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation -DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width -DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width +DECLARE_SOA_INDEX_COLUMN(BC, bc); //! BC index +DECLARE_SOA_COLUMN(X, pmdclsx, float); //! cluster x position +DECLARE_SOA_COLUMN(Y, pmdclsy, float); //! cluster y position +DECLARE_SOA_COLUMN(Z, pmdclsz, float); //! cluster z position +DECLARE_SOA_COLUMN(CluADC, pmdclsadc, float); //! cluster energy in ADC +DECLARE_SOA_COLUMN(CluPID, pmdclspid, float); //! cluster probability, 1: photon, 0:hadron +DECLARE_SOA_COLUMN(Det, pmddet, uint8_t); //! Detector, 0:PRE, 1:CPV +DECLARE_SOA_COLUMN(Ncell, pmdncell, uint8_t); //! cluster cells +DECLARE_SOA_COLUMN(Smn, pmdmodule, int32_t); //! module number +DECLARE_SOA_COLUMN(TrackNo, pmdtrackno, int32_t); //! Track number assigned to clus from simulation +DECLARE_SOA_COLUMN(TrackPid, pmdtrackpid, int32_t); //! Track PID assigned to clus from simulation +DECLARE_SOA_COLUMN(SigX, pmdsigx, float); //! Cluster x-width +DECLARE_SOA_COLUMN(SigY, pmdsigy, float); //! Cluster y-width DECLARE_SOA_COLUMN(ClMatching, pmdclmatching, int32_t); //! Cluster of PRE matching with CPV } // namespace pmd } // namespace run2 @@ -1823,8 +1823,8 @@ using Run2OTFV0 = Run2OTFV0s::iterator; DECLARE_SOA_TABLE(Pmds, "AOD", "PMD", //! Photon information from PMD detector o2::soa::Index<>, run2::pmd::BCId, run2::pmd::X, run2::pmd::Y, run2::pmd::Z, run2::pmd::CluADC, run2::pmd::CluPID, run2::pmd::Det, - run2::pmd::Ncell, run2::pmd::Smn, run2::pmd::TrackNo, run2::pmd::TrackPid, - run2::pmd::SigX, run2::pmd::SigY, run2::pmd::ClMatching); + run2::pmd::Ncell, run2::pmd::Smn, run2::pmd::TrackNo, run2::pmd::TrackPid, + run2::pmd::SigX, run2::pmd::SigY, run2::pmd::ClMatching); using Pmd = Pmds::iterator; From 334853da2ac613750590002612826d1eab9d0fe1 Mon Sep 17 00:00:00 2001 From: abmodak <67369858+abmodak@users.noreply.github.com> Date: Tue, 22 Apr 2025 15:57:47 +0200 Subject: [PATCH 7/7] Update AnalysisDataModel.h --- Framework/Core/include/Framework/AnalysisDataModel.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index b50d4237c3479..18ba823d8f690 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -1800,10 +1800,7 @@ DECLARE_SOA_TABLE_VERSIONED(Run2BCInfos_001, "AOD", "RUN2BCINFO", 1, run2::SPDFiredChipsL0, run2::SPDFiredChipsL1, run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1, run2::V0TriggerChargeA, run2::V0TriggerChargeC, - run2::NTPCClusters, run2::NSDDSSDClusters, - run2::X, run2::Y, run2::Z, run2::CluADC, run2::CluPID, - run2::Det, run2::Ncell, run2::Smn, run2::TrackNo, - run2::TrackPid, run2::SigX, run2::SigY, run2::ClMatching); + run2::NTPCClusters, run2::NSDDSSDClusters); using Run2BCInfos = Run2BCInfos_001; using Run2BCInfo = Run2BCInfos::iterator;