diff --git a/DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/TrackITS.h b/DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/TrackITS.h index 1e7ec569849cb..f020882aa42a1 100644 --- a/DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/TrackITS.h +++ b/DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/TrackITS.h @@ -122,19 +122,25 @@ class TrackITS : public o2::track::TrackParCov void setNextROFbit(bool toggle = true) { setUserField((getUserField() & ~kNextROF) | (-toggle & kNextROF)); } bool hasHitInNextROF() const { return getUserField() & kNextROF; } - void setClusterSize(int l, int size) { - if (l >= 8) return; - if (size > 15) size = 15; + void setClusterSize(int l, int size) + { + if (l >= 8) + return; + if (size > 15) + size = 15; mClusterSizes &= ~(0xf << (l * 4)); mClusterSizes |= (size << (l * 4)); } - int getClusterSize(int l) { - if (l >= 8) return 0; + int getClusterSize(int l) + { + if (l >= 8) + return 0; return (mClusterSizes >> (l * 4)) & 0xf; } - int getClusterSizes() const { + int getClusterSizes() const + { return mClusterSizes; } diff --git a/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TrkClusRef.h b/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TrkClusRef.h index 28e2a6ae44262..37921ea1ac8f4 100644 --- a/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TrkClusRef.h +++ b/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TrkClusRef.h @@ -31,25 +31,28 @@ struct TrkClusRef : public o2::dataformats::RangeRefComp<4> { GPUd() int getNClusters() const { return getEntries(); } bool hasHitOnLayer(int i) { return pattern & (0x1 << i); } - - void setClusterSize(int l, int size) { - if (l >= 8) return; - if (size > 15) size = 15; + void setClusterSize(int l, int size) + { + if (l >= 8) + return; + if (size > 15) + size = 15; clsizes &= ~(0xf << (l * 4)); clsizes |= (size << (l * 4)); } - int getClusterSize(int l) { - if (l >= 8) return 0; + int getClusterSize(int l) + { + if (l >= 8) + return 0; return (clsizes >> (l * 4)) & 0xf; } - int getClusterSizes() const { + int getClusterSizes() const + { return clsizes; } - - ClassDefNV(TrkClusRef, 2); }; diff --git a/Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h b/Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h index f001f49f1e63e..cdfdcff01b132 100644 --- a/Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h +++ b/Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h @@ -594,7 +594,7 @@ class MatchTPCITS gsl::span mITSTracksArray; ///< input ITS tracks span gsl::span mITSTrackClusIdx; ///< input ITS track cluster indices span std::vector mITSClustersArray; ///< ITS clusters created in loadInput - std::vector mITSClusterSizes; ///< ITS cluster sizes created in loadInput + std::vector mITSClusterSizes; ///< ITS cluster sizes created in loadInput gsl::span mITSClusterROFRec; ///< input ITS clusters ROFRecord span gsl::span mFITInfo; ///< optional input FIT info span diff --git a/Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h b/Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h index 82d1e6fcf2e83..ca8059059f435 100644 --- a/Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h +++ b/Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h @@ -426,7 +426,8 @@ inline const gsl::span TimeFrame::getClusterLabels(int layerI return mClusterLabels->getLabels(mClusterExternalIndices[layerId][clId]); } -inline int TimeFrame::getClusterSize(int clusterId) { +inline int TimeFrame::getClusterSize(int clusterId) +{ return mClusterSize[clusterId]; } diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 631cad29c38c9..bdbe0d4a7c343 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -222,7 +222,7 @@ DECLARE_SOA_EXPRESSION_COLUMN(C1Pt21Pt2, c1Pt21Pt2, float, //! DECLARE_SOA_COLUMN(TPCInnerParam, tpcInnerParam, float); //! Momentum at inner wall of the TPC DECLARE_SOA_COLUMN(Flags, flags, uint32_t); //! Track flags. Run 2: see TrackFlagsRun2Enum | Run 3: see TrackFlags DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! Clusters sizes, four bits per a layer, starting from the innermost -DECLARE_SOA_COLUMN(ITSClusterMap, itsClusterMap, uint8_t); //! Old cluster ITS cluster map, kept for retrocompatibility +DECLARE_SOA_COLUMN(ITSClusterMap, itsClusterMap, uint8_t); //! Old cluster ITS cluster map, kept for retrocompatibility DECLARE_SOA_COLUMN(TPCNClsFindable, tpcNClsFindable, uint8_t); //! Findable TPC clusters for this track geometry DECLARE_SOA_COLUMN(TPCNClsFindableMinusFound, tpcNClsFindableMinusFound, int8_t); //! TPC Clusters: Findable - Found DECLARE_SOA_COLUMN(TPCNClsFindableMinusCrossedRows, tpcNClsFindableMinusCrossedRows, int8_t); //! TPC Clusters: Findable - crossed rows