Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion GPU/Common/GPUCommonDefAPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,5 @@
#define get_group_id(dim) iBlock
#endif

// clang-format on
// clang-format on
#endif
12 changes: 6 additions & 6 deletions GPU/GPUTracking/Base/GPUReconstruction.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<GPUMemorySizeScalers> 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<GPUMemorySizeScalers> mMemoryScalers; // Scalers how much memory will be needed

RecoStepField mRecoSteps = RecoStep::AllRecoSteps;
RecoStepField mRecoStepsGPU = RecoStep::AllRecoSteps;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ class GPUTPCCompressionTrackModel
#endif

protected:

#ifdef GPUCA_COMPRESSION_TRACK_MODEL_MERGER
GPUTPCGMPropagator mProp;
GPUTPCGMTrackParam mTrk;
Expand Down
10 changes: 5 additions & 5 deletions GPU/GPUTracking/Global/GPUChainTracking.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega
std::unique_ptr<GPUTPCClusterStatistics> mCompressionStatistics;

// Ptr to detector / calibration objects
std::unique_ptr<TPCFastTransform> mTPCFastTransformU; // Global TPC fast transformation object
std::unique_ptr<TPCPadGainCalib> mTPCPadGainCalibU; // TPC gain calibration and cluster finder parameters
std::unique_ptr<TPCdEdxCalibrationSplines> mdEdxSplinesU; // TPC dEdx calibration splines
std::unique_ptr<o2::base::MatLayerCylSet> mMatLUTU; // Material Lookup Table
std::unique_ptr<o2::trd::GeometryFlat> mTRDGeometryU; // TRD Geometry
std::unique_ptr<TPCFastTransform> mTPCFastTransformU; // Global TPC fast transformation object
std::unique_ptr<TPCPadGainCalib> mTPCPadGainCalibU; // TPC gain calibration and cluster finder parameters
std::unique_ptr<TPCdEdxCalibrationSplines> mdEdxSplinesU; // TPC dEdx calibration splines
std::unique_ptr<o2::base::MatLayerCylSet> mMatLUTU; // Material Lookup Table
std::unique_ptr<o2::trd::GeometryFlat> mTRDGeometryU; // TRD Geometry

std::unique_ptr<o2::tpc::ClusterNativeAccess> mClusterNativeAccess;

Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace tpc
{
class TrackTPC;
class Digit;
}
} // namespace tpc
namespace gpu
{
class TPCFastTransform;
Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/Merger/GPUTPCGMMerger.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion GPU/GPUTracking/Refit/GPUTrackingRefit.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ static constexpr int kIGNORE_ENDS = 3;
// End IgnoreErrors

#ifndef GPUCA_GPUCODE
void GPUTrackingRefitProcessor::InitializeProcessor() {}
void GPUTrackingRefitProcessor::InitializeProcessor()
{
}

void GPUTrackingRefitProcessor::RegisterMemoryAllocation()
{
Expand Down
16 changes: 8 additions & 8 deletions GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
Expand Down
6 changes: 3 additions & 3 deletions GPU/GPUTracking/SliceTracker/GPUTPCRow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion GPU/GPUTracking/SliceTracker/GPUTPCTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ class GPUTPCTracker : public GPUProcessor
StructGPUParameters gpuParameters; // GPU parameters
};


#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
GPUhdi() GPUglobalref() const GPUTPCClusterData* ClusterData() const
{
Expand Down
6 changes: 3 additions & 3 deletions GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDecodeZS.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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<const TPCZSTBHDR*>(pagePtr);
if ((tbHdr->rowMask & 0x7FFF) == 0) {
pagePtr += 2;
Expand Down Expand Up @@ -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
}
}
}
Expand Down
1 change: 0 additions & 1 deletion GPU/GPUTracking/TPCClusterFinder/TPCPadGainCalib.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ struct TPCPadGainCalib {

unsigned short mPadOffsetPerRow[TPC_NUM_OF_ROWS];
SectorPadGainCorrection<unsigned short> mGainCorrection[TPC_SECTORS];

};

} // namespace GPUCA_NAMESPACE::gpu
Expand Down
1 change: 0 additions & 1 deletion GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,6 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::FollowProlongation(PROP* prop, TRDTRK
return true;
}


template <class TRDTRK, class PROP>
GPUd() void GPUTRDTracker_t<TRDTRK, PROP>::InsertHypothesis(Hypothesis hypo, int& nCurrHypothesis, int idxOffset)
{
Expand Down
19 changes: 9 additions & 10 deletions GPU/GPUTracking/TRDTracking/GPUTRDTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#ifndef GPUTRDTRACKER_H
#define GPUTRDTRACKER_H


#include "GPUCommonDef.h"
#include "GPUProcessor.h"
#include "GPUTRDDef.h"
Expand Down Expand Up @@ -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<TRDTRK>* 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<TRDTRK>* mDebug; // debug output
};
} // namespace gpu
} // namespace GPUCA_NAMESPACE
Expand Down
6 changes: 3 additions & 3 deletions GPU/GPUTracking/TRDTracking/GPUTRDTrackerComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ClassImp(GPUTRDTrackletReaderComponent);
} \
}

GPUTRDTrackletReaderComponent::GPUTRDTrackletReaderComponent()
GPUTRDTrackletReaderComponent::GPUTRDTrackletReaderComponent()
: AliHLTProcessor(), fDebugLevel(0), fEventId(fgkInvalidEventId), fTrackletArray(nullptr), fRawReaderMem(nullptr), fRawReaderTrd(nullptr)
{
// constructor
Expand Down
2 changes: 0 additions & 2 deletions GPU/GPUTracking/TRDTracking/macros/checkDbgOutput.C
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions GPU/GPUTracking/TRDTracking/macros/run_trd_tracker.C
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion GPU/GPUTracking/dEdx/GPUdEdx.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down