Skip to content

Commit 12ac313

Browse files
committed
GPU: Remove all AliRoot code
1 parent 9523967 commit 12ac313

File tree

406 files changed

+891
-8695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+891
-8695
lines changed

DataFormats/Detectors/TPC/include/DataFormatsTPC/PIDResponse.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ class PIDResponse
6565
float mMIP = 50.f;
6666
float mChargeFactor = 2.299999952316284f;
6767

68-
#ifndef GPUCA_ALIROOT_LIB
6968
ClassDefNV(PIDResponse, 1);
70-
#endif
7169
};
7270

7371
GPUd() void PIDResponse::setBetheBlochParams(const float betheBlochParams[5])

DataFormats/Detectors/TRD/include/DataFormatsTRD/Tracklet64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class Tracklet64
144144
GPUd() float getPadColFloat(bool applyShift) const { return getPositionFloat() + getMCMCol() * constants::NCOLMCM + 8.f + (applyShift ? 1.f : 0.f); }
145145

146146
// pad column number inside pad row as int can be off by +-1 pad (same function name as for TRD digit)
147-
GPUd() int getPadCol(bool applyShift = false) const { return GPUCA_NAMESPACE::gpu::CAMath::Float2IntRn(getPadColFloat(applyShift)); }
147+
GPUd() int getPadCol(bool applyShift = false) const { return o2::gpu::CAMath::Float2IntRn(getPadColFloat(applyShift)); }
148148

149149
// translate local position into global y (in cm) not taking into account calibrations (ExB, vDrift, t0)
150150
GPUd() float getUncalibratedY(bool applyShift = false) const { return (getPadColFloat(applyShift) - (constants::NCOLUMN / 2.f)) * getPadWidth(); }

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ void AODProducerWorkflowDPL::countTPCClusters(const o2::globaltracking::RecoCont
14701470
o2::tpc::TrackTPC::getClusterReference(tpcClusRefs, i, sectorIndex, rowIndex, clusterIndex, track.getClusterRef());
14711471
unsigned int absoluteIndex = tpcClusAcc.clusterOffset[sectorIndex][rowIndex] + clusterIndex;
14721472
clMap[rowIndex] = true;
1473-
if (tpcClusShMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) {
1473+
if (tpcClusShMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) {
14741474
if (!shMap[rowIndex]) {
14751475
counters.shared++;
14761476
}

Detectors/GlobalTracking/include/GlobalTracking/TrackMethods.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TrackMethods
4747
o2::tpc::TrackTPC::getClusterReference(tpcClusRefs, i, sectorIndex, rowIndex, clusterIndex, track.getClusterRef());
4848
unsigned int absoluteIndex = tpcClusAcc.clusterOffset[sectorIndex][rowIndex] + clusterIndex;
4949
clMap[rowIndex] = true;
50-
if (tpcClusShMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) {
50+
if (tpcClusShMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) {
5151
if (!shMap[rowIndex]) {
5252
shared++;
5353
}

Detectors/GlobalTracking/src/MatchTPCITS.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2880,7 +2880,7 @@ void MatchTPCITS::dumpTPCOrig(bool acc, int tpcIndex)
28802880
for (int i = 0; i < tpcOrig.getNClusterReferences(); i++) {
28812881
tpcOrig.getClusterReference(mTPCTrackClusIdx, i, clSect, clRow, clIdx);
28822882
unsigned int absoluteIndex = mTPCClusterIdxStruct->clusterOffset[clSect][clRow] + clIdx;
2883-
if (mTPCRefitterShMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) {
2883+
if (mTPCRefitterShMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) {
28842884
if (!(prevRow == clRow && prevRawShared)) {
28852885
nshared++;
28862886
}

Detectors/GlobalTrackingWorkflow/study/src/TrackingStudy.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void TrackingStudySpec::process(o2::globaltracking::RecoContainer& recoData)
266266
clRowP = clRow;
267267
}
268268
unsigned int absoluteIndex = tpcClusAcc.clusterOffset[clSect][clRow] + clIdx;
269-
if (shMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) {
269+
if (shMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) {
270270
trExt.nClTPCShared++;
271271
}
272272
}

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/TrackCuts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class TrackCuts
7676
o2::tpc::TrackTPC::getClusterReference(tpcClusRefs, i, sectorIndex, rowIndex, clusterIndex, track.getClusterRef());
7777
unsigned int absoluteIndex = tpcClusAcc.clusterOffset[sectorIndex][rowIndex] + clusterIndex;
7878
clMap[rowIndex] = true;
79-
if (tpcClusShMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) {
79+
if (tpcClusShMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) {
8080
if (!shMap[rowIndex]) {
8181
counters.shared++;
8282
}

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/TrackMethods.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TrackMethods
5353
o2::tpc::TrackTPC::getClusterReference(tpcClusRefs, i, sectorIndex, rowIndex, clusterIndex, track.getClusterRef());
5454
unsigned int absoluteIndex = tpcClusAcc.clusterOffset[sectorIndex][rowIndex] + clusterIndex;
5555
clMap[rowIndex] = true;
56-
if (tpcClusShMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) {
56+
if (tpcClusShMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) {
5757
if (!shMap[rowIndex]) {
5858
shared++;
5959
}

Detectors/TPC/calibration/include/TPCCalibration/CorrectionMapsLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class CorrectionMapsLoader : public o2::gpu::CorrectionMapsHelper
7575

7676
float mInstLumiCTPFactor = 1.0; // multiplicative factor for inst. lumi
7777
int mLumiCTPSource = 0; // 0: main, 1: alternative CTP lumi source
78-
std::unique_ptr<GPUCA_NAMESPACE::gpu::TPCFastTransform> mCorrMapMShape{nullptr};
78+
std::unique_ptr<o2::gpu::TPCFastTransform> mCorrMapMShape{nullptr};
7979
#endif
8080
};
8181

Detectors/TPC/calibration/src/CalculatedEdx.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void CalculatedEdx::calculatedEdx(o2::tpc::TrackTPC& track, dEdxInfo& output, fl
159159

160160
// check if the cluster is shared
161161
const unsigned int absoluteIndex = mClusterIndex->clusterOffset[sectorIndex][rowIndex] + clusterIndexNumb;
162-
const bool isShared = mRefit ? (mTPCRefitterShMap[absoluteIndex] & GPUCA_NAMESPACE::gpu::GPUTPCGMMergedTrackHit::flagShared) : 0;
162+
const bool isShared = mRefit ? (mTPCRefitterShMap[absoluteIndex] & o2::gpu::GPUTPCGMMergedTrackHit::flagShared) : 0;
163163

164164
// get region, pad, stack and stack ID
165165
const int region = Mapper::REGION[rowIndex];

0 commit comments

Comments
 (0)