Skip to content

Commit 966f1b0

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent a02d21f commit 966f1b0

5 files changed

Lines changed: 26 additions & 11 deletions

File tree

‎GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ std::pair<uint32_t, uint32_t> GPUChainTracking::TPCClusterizerDecodeZSCount(uint
149149
uint32_t endpointAdcSamples[GPUTrackingInOutZS::NENDPOINTS];
150150
memset(endpointAdcSamples, 0, sizeof(endpointAdcSamples));
151151
bool doGPU = mRec->GetRecoStepsGPU() & GPUDataTypes::RecoStep::TPCClusterFinding;
152-
int32_t firstHBF = (mIOPtrs.settingsTF && mIOPtrs.settingsTF->hasTfStartOrbit) ? mIOPtrs.settingsTF->tfStartOrbit : (mIOPtrs.tpcZS->sector[iSector].count[0] && mIOPtrs.tpcZS->sector[iSector].nZSPtr[0][0]) ? o2::raw::RDHUtils::getHeartBeatOrbit(*(const o2::header::RAWDataHeader*)mIOPtrs.tpcZS->sector[iSector].zsPtr[0][0]) : 0;
152+
int32_t firstHBF = (mIOPtrs.settingsTF && mIOPtrs.settingsTF->hasTfStartOrbit) ? mIOPtrs.settingsTF->tfStartOrbit : (mIOPtrs.tpcZS->sector[iSector].count[0] && mIOPtrs.tpcZS->sector[iSector].nZSPtr[0][0]) ? o2::raw::RDHUtils::getHeartBeatOrbit(*(const o2::header::RAWDataHeader*)mIOPtrs.tpcZS->sector[iSector].zsPtr[0][0])
153+
: 0;
153154

154155
for (uint16_t j = 0; j < GPUTrackingInOutZS::NENDPOINTS; j++) {
155156
#ifndef GPUCA_NO_VC

‎GPU/GPUTracking/Merger/GPUTPCGMMerger.h‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,18 @@ class GPUTPCGMMerger : public GPUProcessor
252252
uint32_t mNMaxLooperMatches = 0; // Maximum number of candidate pairs for looper matching
253253

254254
uint16_t mMemoryResMemory = (uint16_t)-1;
255-
uint16_t mMemoryResOutput = (uint16_t)-1;;
256-
uint16_t mMemoryResOutputState = (uint16_t)-1;;
257-
uint16_t mMemoryResOutputO2 = (uint16_t)-1;;
258-
uint16_t mMemoryResOutputO2Clus = (uint16_t)-1;;
259-
uint16_t mMemoryResOutputO2MC = (uint16_t)-1;;
260-
uint16_t mMemoryResOutputO2Scratch = (uint16_t)-1;;
255+
uint16_t mMemoryResOutput = (uint16_t)-1;
256+
;
257+
uint16_t mMemoryResOutputState = (uint16_t)-1;
258+
;
259+
uint16_t mMemoryResOutputO2 = (uint16_t)-1;
260+
;
261+
uint16_t mMemoryResOutputO2Clus = (uint16_t)-1;
262+
;
263+
uint16_t mMemoryResOutputO2MC = (uint16_t)-1;
264+
;
265+
uint16_t mMemoryResOutputO2Scratch = (uint16_t)-1;
266+
;
261267

262268
int32_t mNClusters = 0; // Total number of incoming clusters (from sector tracks)
263269
GPUTPCGMMergedTrack* mOutputTracks = nullptr; //* array of output merged tracks

‎GPU/GPUTracking/SectorTracker/GPUTPCRow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class GPUTPCRow
6868
float mHstepYi; // inverse step size
6969
float mHstepZi; // inverse step size
7070

71-
int32_t mHitNumberOffset; // index of the first hit in the hit array, used as offset in GPUTPCTrackingData::LinkUp/DownData/HitDataY/...
71+
int32_t mHitNumberOffset; // index of the first hit in the hit array, used as offset in GPUTPCTrackingData::LinkUp/DownData/HitDataY/...
7272
uint32_t mFirstHitInBinOffset; // offset in Tracker::mRowData to find the FirstHitInBin
7373
};
7474
} // namespace o2::gpu

‎GPU/GPUTracking/display/GPUDisplay.cxx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,15 @@ void GPUDisplay::DrawGLScene_cameraAndAnimation(float animateTime, float& mixSla
411411

412412
void GPUDisplay::DrawGLScene_drawCommands()
413413
{
414-
#define LOOP_SECTOR for (int32_t iSector = (mCfgL.drawSector == -1 ? 0 : mCfgL.drawRelatedSectors ? (mCfgL.drawSector % (NSECTORS / 4)) : mCfgL.drawSector); iSector < NSECTORS; iSector += (mCfgL.drawSector == -1 ? 1 : mCfgL.drawRelatedSectors ? (NSECTORS / 4) : NSECTORS))
415-
#define LOOP_SECTOR2 for (int32_t iSector = (mCfgL.drawSector == -1 ? 0 : mCfgL.drawRelatedSectors ? (mCfgL.drawSector % (NSECTORS / 4)) : mCfgL.drawSector) % (NSECTORS / 2); iSector < NSECTORS / 2; iSector += (mCfgL.drawSector == -1 ? 1 : mCfgL.drawRelatedSectors ? (NSECTORS / 4) : NSECTORS))
414+
#define LOOP_SECTOR for (int32_t iSector = (mCfgL.drawSector == -1 ? 0 : mCfgL.drawRelatedSectors ? (mCfgL.drawSector % (NSECTORS / 4)) \
415+
: mCfgL.drawSector); \
416+
iSector < NSECTORS; iSector += (mCfgL.drawSector == -1 ? 1 : mCfgL.drawRelatedSectors ? (NSECTORS / 4) \
417+
: NSECTORS))
418+
#define LOOP_SECTOR2 for (int32_t iSector = (mCfgL.drawSector == -1 ? 0 : mCfgL.drawRelatedSectors ? (mCfgL.drawSector % (NSECTORS / 4)) \
419+
: mCfgL.drawSector) % \
420+
(NSECTORS / 2); \
421+
iSector < NSECTORS / 2; iSector += (mCfgL.drawSector == -1 ? 1 : mCfgL.drawRelatedSectors ? (NSECTORS / 4) \
422+
: NSECTORS))
416423
#define LOOP_COLLISION for (int32_t iCol = (mCfgL.showCollision == -1 ? 0 : mCfgL.showCollision); iCol < mNCollissions; iCol += (mCfgL.showCollision == -1 ? 1 : mNCollissions))
417424
#define LOOP_COLLISION_COL(cmd) \
418425
LOOP_COLLISION \

‎GPU/GPUTracking/display/render/GPUDisplayDraw.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ GPUDisplay::vboList GPUDisplay::DrawClusters(int32_t iSector, int32_t select, ui
127127
size_t startCountInner = mVertexBuffer[iSector].size();
128128
if (mOverlayTFClusters.size() > 0 || iCol == 0 || mNCollissions) {
129129
const int32_t firstCluster = (mOverlayTFClusters.size() > 1 && iCol > 0) ? mOverlayTFClusters[iCol - 1][iSector] : 0;
130-
const int32_t lastCluster = (mOverlayTFClusters.size() > 1 && iCol + 1 < mOverlayTFClusters.size()) ? mOverlayTFClusters[iCol][iSector] : (mParam->par.earlyTpcTransform ? mIOPtrs->nClusterData[iSector] : mIOPtrs->clustersNative ? mIOPtrs->clustersNative->nClustersSector[iSector] : 0);
130+
const int32_t lastCluster = (mOverlayTFClusters.size() > 1 && iCol + 1 < mOverlayTFClusters.size()) ? mOverlayTFClusters[iCol][iSector] : (mParam->par.earlyTpcTransform ? mIOPtrs->nClusterData[iSector] : mIOPtrs->clustersNative ? mIOPtrs->clustersNative->nClustersSector[iSector]
131+
: 0);
131132
const bool checkClusterCollision = mQA && mNCollissions && mOverlayTFClusters.size() == 0 && mIOPtrs->clustersNative && mIOPtrs->clustersNative->clustersMCTruth;
132133
for (int32_t cidInSector = firstCluster; cidInSector < lastCluster; cidInSector++) {
133134
const int32_t cid = GET_CID(iSector, cidInSector);

0 commit comments

Comments
 (0)