diff --git a/GPU/Common/GPUCommonDefAPI.h b/GPU/Common/GPUCommonDefAPI.h index 576d03cd897a1..d0bcd25b38673 100644 --- a/GPU/Common/GPUCommonDefAPI.h +++ b/GPU/Common/GPUCommonDefAPI.h @@ -228,5 +228,5 @@ #define get_group_id(dim) iBlock #endif - // clang-format on + // clang-format on #endif diff --git a/GPU/GPUTracking/Base/GPUReconstruction.h b/GPU/GPUTracking/Base/GPUReconstruction.h index 77e5a0d576155..33c9a9e0f9a94 100644 --- a/GPU/GPUTracking/Base/GPUReconstruction.h +++ b/GPU/GPUTracking/Base/GPUReconstruction.h @@ -322,12 +322,12 @@ class GPUReconstruction GPUConstantMem* mDeviceConstantMem = nullptr; // Settings - GPUSettingsEvent mEventSettings; // Event Parameters - GPUSettingsDeviceBackend mDeviceBackendSettings; // Processing Parameters (at constructor level) - GPUSettingsProcessing mProcessingSettings; // Processing Parameters (at init level) - GPUOutputControl mOutputControl; // Controls the output of the individual components - GPUOutputControl mInputControl; // Prefefined input memory location for reading standalone dumps - std::unique_ptr mMemoryScalers; // Scalers how much memory will be needed + GPUSettingsEvent mEventSettings; // Event Parameters + GPUSettingsDeviceBackend mDeviceBackendSettings; // Processing Parameters (at constructor level) + GPUSettingsProcessing mProcessingSettings; // Processing Parameters (at init level) + GPUOutputControl mOutputControl; // Controls the output of the individual components + GPUOutputControl mInputControl; // Prefefined input memory location for reading standalone dumps + std::unique_ptr mMemoryScalers; // Scalers how much memory will be needed RecoStepField mRecoSteps = RecoStep::AllRecoSteps; RecoStepField mRecoStepsGPU = RecoStep::AllRecoSteps; diff --git a/GPU/GPUTracking/DataCompression/GPUTPCCompressionTrackModel.h b/GPU/GPUTracking/DataCompression/GPUTPCCompressionTrackModel.h index 7f13e434bea45..795b7321df4dd 100644 --- a/GPU/GPUTracking/DataCompression/GPUTPCCompressionTrackModel.h +++ b/GPU/GPUTracking/DataCompression/GPUTPCCompressionTrackModel.h @@ -102,7 +102,6 @@ class GPUTPCCompressionTrackModel #endif protected: - #ifdef GPUCA_COMPRESSION_TRACK_MODEL_MERGER GPUTPCGMPropagator mProp; GPUTPCGMTrackParam mTrk; diff --git a/GPU/GPUTracking/Global/GPUChainTracking.h b/GPU/GPUTracking/Global/GPUChainTracking.h index ec25dfaf99e3d..ba9493d562888 100644 --- a/GPU/GPUTracking/Global/GPUChainTracking.h +++ b/GPU/GPUTracking/Global/GPUChainTracking.h @@ -244,11 +244,11 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega std::unique_ptr mCompressionStatistics; // Ptr to detector / calibration objects - std::unique_ptr mTPCFastTransformU; // Global TPC fast transformation object - std::unique_ptr mTPCPadGainCalibU; // TPC gain calibration and cluster finder parameters - std::unique_ptr mdEdxSplinesU; // TPC dEdx calibration splines - std::unique_ptr mMatLUTU; // Material Lookup Table - std::unique_ptr mTRDGeometryU; // TRD Geometry + std::unique_ptr mTPCFastTransformU; // Global TPC fast transformation object + std::unique_ptr mTPCPadGainCalibU; // TPC gain calibration and cluster finder parameters + std::unique_ptr mdEdxSplinesU; // TPC dEdx calibration splines + std::unique_ptr mMatLUTU; // Material Lookup Table + std::unique_ptr mTRDGeometryU; // TRD Geometry std::unique_ptr mClusterNativeAccess; diff --git a/GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h b/GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h index d706d2f98ecd1..8937d1f49ee94 100644 --- a/GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h +++ b/GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h @@ -45,7 +45,7 @@ namespace tpc { class TrackTPC; class Digit; -} +} // namespace tpc namespace gpu { class TPCFastTransform; diff --git a/GPU/GPUTracking/Merger/GPUTPCGMMerger.h b/GPU/GPUTracking/Merger/GPUTPCGMMerger.h index 00e83fc365d2f..2faa7fb37a335 100644 --- a/GPU/GPUTracking/Merger/GPUTPCGMMerger.h +++ b/GPU/GPUTracking/Merger/GPUTPCGMMerger.h @@ -231,8 +231,8 @@ class GPUTPCGMMerger : public GPUProcessor unsigned short mMemoryResOutputO2Clus; unsigned short mMemoryResOutputO2MC; - int mNClusters; // Total number of incoming clusters (from slice tracks) - GPUTPCGMMergedTrack* mOutputTracks; //* array of output merged tracks + int mNClusters; // Total number of incoming clusters (from slice tracks) + GPUTPCGMMergedTrack* mOutputTracks; //* array of output merged tracks GPUTPCGMSliceTrack* mSliceTrackInfos; //* additional information for slice tracks int* mSliceTrackInfoIndex; GPUTPCGMMergedTrackHit* mClusters; diff --git a/GPU/GPUTracking/Refit/GPUTrackingRefit.cxx b/GPU/GPUTracking/Refit/GPUTrackingRefit.cxx index 809bc6929f16e..023694186c481 100644 --- a/GPU/GPUTracking/Refit/GPUTrackingRefit.cxx +++ b/GPU/GPUTracking/Refit/GPUTrackingRefit.cxx @@ -46,7 +46,9 @@ static constexpr int kIGNORE_ENDS = 3; // End IgnoreErrors #ifndef GPUCA_GPUCODE -void GPUTrackingRefitProcessor::InitializeProcessor() {} +void GPUTrackingRefitProcessor::InitializeProcessor() +{ +} void GPUTrackingRefitProcessor::RegisterMemoryAllocation() { diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h b/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h index 7b0d2a41b03d8..ebb882a5ef52b 100644 --- a/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h +++ b/GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h @@ -35,14 +35,14 @@ class GPUTPCNeighboursFinder : public GPUKernelTemplate public: MEM_CLASS_PRE() struct GPUSharedMemory { - int mNHits; // n hits - float mUpDx; // x distance to the next row - float mDnDx; // x distance to the previous row - float mUpTx; // normalized x distance to the next row - float mDnTx; // normalized x distance to the previous row - int mIRow; // row number - int mIRowUp; // next row number - int mIRowDn; // previous row number + int mNHits; // n hits + float mUpDx; // x distance to the next row + float mDnDx; // x distance to the previous row + float mUpTx; // normalized x distance to the next row + float mDnTx; // normalized x distance to the previous row + int mIRow; // row number + int mIRowUp; // next row number + int mIRowDn; // previous row number #if GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP > 0 float mA1[GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP][GPUCA_GET_THREAD_COUNT(GPUCA_LB_GPUTPCNeighboursFinder)]; float mA2[GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP][GPUCA_GET_THREAD_COUNT(GPUCA_LB_GPUTPCNeighboursFinder)]; diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCRow.h b/GPU/GPUTracking/SliceTracker/GPUTPCRow.h index 8303248168ffd..f0a6dc9d5b4a1 100644 --- a/GPU/GPUTracking/SliceTracker/GPUTPCRow.h +++ b/GPU/GPUTracking/SliceTracker/GPUTPCRow.h @@ -60,9 +60,9 @@ class GPUTPCRow friend class GPUTPCNeighboursFinder; friend class GPUTPCStartHitsFinder; - int mNHits; // number of hits - float mX; // X coordinate of the row - float mMaxY; // maximal Y coordinate of the row + int mNHits; // number of hits + float mX; // X coordinate of the row + float mMaxY; // maximal Y coordinate of the row MEM_LG(GPUTPCGrid) mGrid; // grid of hits diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTracker.h b/GPU/GPUTracking/SliceTracker/GPUTPCTracker.h index 6f70b47a96464..51fcffc57a78d 100644 --- a/GPU/GPUTracking/SliceTracker/GPUTPCTracker.h +++ b/GPU/GPUTracking/SliceTracker/GPUTPCTracker.h @@ -93,7 +93,6 @@ class GPUTPCTracker : public GPUProcessor StructGPUParameters gpuParameters; // GPU parameters }; - #if !defined(__OPENCL__) || defined(__OPENCLCPP__) GPUhdi() GPUglobalref() const GPUTPCClusterData* ClusterData() const { diff --git a/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDecodeZS.cxx b/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDecodeZS.cxx index ae9d5ab3fda0c..ff68e6794e7a7 100644 --- a/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDecodeZS.cxx +++ b/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDecodeZS.cxx @@ -93,7 +93,7 @@ GPUdii() void GPUTPCCFDecodeZS::decode(GPUTPCClusterFinder& clusterer, GPUShared const int nRows = (endpoint & 1) ? (s.nRowsRegion - s.nRowsRegion / 2) : (s.nRowsRegion / 2); for (int l = 0; l < hdr->nTimeBins; l++) { // TODO: Parallelize over time bins - pagePtr += (pagePtr - page) & 1; //Ensure 16 bit alignment + pagePtr += (pagePtr - page) & 1; //Ensure 16 bit alignment const TPCZSTBHDR* tbHdr = reinterpret_cast(pagePtr); if ((tbHdr->rowMask & 0x7FFF) == 0) { pagePtr += 2; @@ -185,8 +185,8 @@ GPUdii() void GPUTPCCFDecodeZS::decode(GPUTPCClusterFinder& clusterer, GPUShared if (nRowsUsed > 1) { pagePtr = page + tbHdr->rowAddr1()[nRowsUsed - 2]; } - pagePtr += 2 * *pagePtr; // Go to entry for last sequence length - pagePtr += 1 + (*pagePtr * decodeBits + 7) / 8; // Go to beginning of next time bin + pagePtr += 2 * *pagePtr; // Go to entry for last sequence length + pagePtr += 1 + (*pagePtr * decodeBits + 7) / 8; // Go to beginning of next time bin } } } diff --git a/GPU/GPUTracking/TPCClusterFinder/TPCPadGainCalib.h b/GPU/GPUTracking/TPCClusterFinder/TPCPadGainCalib.h index cf26ef5e0168e..d1ad18cd6d863 100644 --- a/GPU/GPUTracking/TPCClusterFinder/TPCPadGainCalib.h +++ b/GPU/GPUTracking/TPCClusterFinder/TPCPadGainCalib.h @@ -125,7 +125,6 @@ struct TPCPadGainCalib { unsigned short mPadOffsetPerRow[TPC_NUM_OF_ROWS]; SectorPadGainCorrection mGainCorrection[TPC_SECTORS]; - }; } // namespace GPUCA_NAMESPACE::gpu diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx index 002db3e13c8a7..aa47736ea1ac6 100644 --- a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx +++ b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx @@ -1033,7 +1033,6 @@ GPUd() bool GPUTRDTracker_t::FollowProlongation(PROP* prop, TRDTRK return true; } - template GPUd() void GPUTRDTracker_t::InsertHypothesis(Hypothesis hypo, int& nCurrHypothesis, int idxOffset) { diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.h b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.h index 02739fbdad80b..bac0048452d66 100644 --- a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.h +++ b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.h @@ -16,7 +16,6 @@ #ifndef GPUTRDTRACKER_H #define GPUTRDTRACKER_H - #include "GPUCommonDef.h" #include "GPUProcessor.h" #include "GPUTRDDef.h" @@ -204,15 +203,15 @@ class GPUTRDTracker_t : public GPUProcessor float mAngleToDyB; // parameterization for conversion track angle -> tracklet deflection float mAngleToDyC; // parameterization for conversion track angle -> tracklet deflection /// ---- end error parametrization ---- - bool mDebugOutput; // store debug output - float mTimeWindow; // max. deviation of the ITS-TPC track time w.r.t. TRD trigger record time stamp (in us, default is 100 ns) - float mRadialOffset; // due to mis-calibration of t0 - float mMaxEta; // TPC tracks with higher eta are ignored - float mExtraRoadY; // addition to search road in r-phi to account for not exact radial match of tracklets and tracks in first iteration - float mRoadZ; // in z, a constant search road is used - float mZCorrCoefNRC; // tracklet z-position depends linearly on track dip angle - AliMCEvent* mMCEvent; //! externaly supplied optional MC event - GPUTRDTrackerDebug* mDebug; // debug output + bool mDebugOutput; // store debug output + float mTimeWindow; // max. deviation of the ITS-TPC track time w.r.t. TRD trigger record time stamp (in us, default is 100 ns) + float mRadialOffset; // due to mis-calibration of t0 + float mMaxEta; // TPC tracks with higher eta are ignored + float mExtraRoadY; // addition to search road in r-phi to account for not exact radial match of tracklets and tracks in first iteration + float mRoadZ; // in z, a constant search road is used + float mZCorrCoefNRC; // tracklet z-position depends linearly on track dip angle + AliMCEvent* mMCEvent; //! externaly supplied optional MC event + GPUTRDTrackerDebug* mDebug; // debug output }; } // namespace gpu } // namespace GPUCA_NAMESPACE diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTrackerComponent.h b/GPU/GPUTracking/TRDTracking/GPUTRDTrackerComponent.h index 6adc8704e7e79..c654dd2c0d8fb 100644 --- a/GPU/GPUTracking/TRDTracking/GPUTRDTrackerComponent.h +++ b/GPU/GPUTracking/TRDTracking/GPUTRDTrackerComponent.h @@ -132,9 +132,9 @@ class GPUTRDTrackerComponent : public AliHLTProcessor * --------------------------------------------------------------------------------- */ GPUCA_NAMESPACE::gpu::GPUTRDTrackerGPU* fTracker; // the tracker itself - GPUCA_NAMESPACE::gpu::GPUTRDGeometry* fGeo; // TRD geometry needed by the tracker - GPUCA_NAMESPACE::gpu::GPUReconstruction* fRec; // GPU Reconstruction object - GPUCA_NAMESPACE::gpu::GPUChainTracking* fChain; // Tracking Chain Object + GPUCA_NAMESPACE::gpu::GPUTRDGeometry* fGeo; // TRD geometry needed by the tracker + GPUCA_NAMESPACE::gpu::GPUReconstruction* fRec; // GPU Reconstruction object + GPUCA_NAMESPACE::gpu::GPUChainTracking* fChain; // Tracking Chain Object TList* fTrackList; bool fDebugTrackOutput; // output GPUTRDTracks instead AliHLTExternalTrackParam diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTrackletReaderComponent.cxx b/GPU/GPUTracking/TRDTracking/GPUTRDTrackletReaderComponent.cxx index ff78dba37b8e4..7983a129194d8 100644 --- a/GPU/GPUTracking/TRDTracking/GPUTRDTrackletReaderComponent.cxx +++ b/GPU/GPUTracking/TRDTracking/GPUTRDTrackletReaderComponent.cxx @@ -63,7 +63,7 @@ ClassImp(GPUTRDTrackletReaderComponent); } \ } - GPUTRDTrackletReaderComponent::GPUTRDTrackletReaderComponent() +GPUTRDTrackletReaderComponent::GPUTRDTrackletReaderComponent() : AliHLTProcessor(), fDebugLevel(0), fEventId(fgkInvalidEventId), fTrackletArray(nullptr), fRawReaderMem(nullptr), fRawReaderTrd(nullptr) { // constructor diff --git a/GPU/GPUTracking/TRDTracking/macros/checkDbgOutput.C b/GPU/GPUTracking/TRDTracking/macros/checkDbgOutput.C index 7e0175905c7bf..48659d41d1cbd 100644 --- a/GPU/GPUTracking/TRDTracking/macros/checkDbgOutput.C +++ b/GPU/GPUTracking/TRDTracking/macros/checkDbgOutput.C @@ -852,8 +852,6 @@ void TwoTrackletEfficiency(Int_t nEntries = -1) fOut = 0x0; } - - void PlotTRDEfficiency(Int_t nEntries = -1, Bool_t writeToFile = kTRUE) { // plot fraction of tracks with at least 4/5/6 online/offline tracklets diff --git a/GPU/GPUTracking/TRDTracking/macros/run_trd_tracker.C b/GPU/GPUTracking/TRDTracking/macros/run_trd_tracker.C index d53118770e0d6..e4a15dc0f2a86 100644 --- a/GPU/GPUTracking/TRDTracking/macros/run_trd_tracker.C +++ b/GPU/GPUTracking/TRDTracking/macros/run_trd_tracker.C @@ -56,9 +56,9 @@ void run_trd_tracker(std::string path = "./", const o2::trd::GeometryFlat geoFlat(*geo); //-------- init GPU reconstruction --------// - GPUSettingsEvent cfgEvent; // defaults should be ok - GPUSettingsRec cfgRec; // don't care for now, NWaysOuter is set in here for instance - GPUSettingsProcessing cfgDeviceProcessing; // also keep defaults here, or adjust debug level + GPUSettingsEvent cfgEvent; // defaults should be ok + GPUSettingsRec cfgRec; // don't care for now, NWaysOuter is set in here for instance + GPUSettingsProcessing cfgDeviceProcessing; // also keep defaults here, or adjust debug level cfgDeviceProcessing.debugLevel = 5; GPURecoStepConfiguration cfgRecoStep; cfgRecoStep.steps = GPUDataTypes::RecoStep::NoRecoStep; diff --git a/GPU/GPUTracking/dEdx/GPUdEdx.cxx b/GPU/GPUTracking/dEdx/GPUdEdx.cxx index 2fe03a6e20cb3..061d06382f645 100644 --- a/GPU/GPUTracking/dEdx/GPUdEdx.cxx +++ b/GPU/GPUTracking/dEdx/GPUdEdx.cxx @@ -20,7 +20,10 @@ using namespace GPUCA_NAMESPACE::gpu; #ifndef GPUCA_GPUCODE_DEVICE -GPUd() void GPUdEdx::clear() { new (this) GPUdEdx; } +GPUd() void GPUdEdx::clear() +{ + new (this) GPUdEdx; +} #endif GPUd() void GPUdEdx::computedEdx(GPUdEdxInfo& GPUrestrict() output, const GPUParam& GPUrestrict() param)