Skip to content

Please consider the following formatting changes to #12044 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmazzasc merged 1 commit into from
Oct 9, 2023
Merged

Please consider the following formatting changes to #12044 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/TrackITS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
21 changes: 12 additions & 9 deletions DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TrkClusRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};

Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ class MatchTPCITS
gsl::span<const o2::its::TrackITS> mITSTracksArray; ///< input ITS tracks span
gsl::span<const int> mITSTrackClusIdx; ///< input ITS track cluster indices span
std::vector<ITSCluster> mITSClustersArray; ///< ITS clusters created in loadInput
std::vector<unsigned int> mITSClusterSizes; ///< ITS cluster sizes created in loadInput
std::vector<unsigned int> mITSClusterSizes; ///< ITS cluster sizes created in loadInput

gsl::span<const o2::itsmft::ROFRecord> mITSClusterROFRec; ///< input ITS clusters ROFRecord span
gsl::span<const o2::ft0::RecPoints> mFITInfo; ///< optional input FIT info span
Expand Down
3 changes: 2 additions & 1 deletion Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,8 @@ inline const gsl::span<const MCCompLabel> 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];
}

Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down