GPU: Fix compilation of standalone benchmark for Run2 data

davidrohr · davidrohr · commit 99927de215ac · 2021-03-14T09:39:35.000+01:00
diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTrackletWord.cxx b/GPU/GPUTracking/TRDTracking/GPUTRDTrackletWord.cxx
@@ -16,19 +16,15 @@ using namespace GPUCA_NAMESPACE::gpu;
 
 #ifndef GPUCA_TPC_GEOMETRY_O2
 
-#include "AliTRDtrackletWord.h"
-#include "AliTRDtrackletMCM.h"
-
-#ifndef GPUCA_GPUCODE_DEVICE
-#include <new>
-#endif
-
 GPUd() GPUTRDTrackletWord::GPUTRDTrackletWord(unsigned int trackletWord) : mId(-1), mHCId(-1), mTrackletWord(trackletWord)
 {
 }
 GPUd() GPUTRDTrackletWord::GPUTRDTrackletWord(unsigned int trackletWord, int hcid, int id) : mId(id), mHCId(hcid), mTrackletWord(trackletWord) {}
 
-#ifndef GPUCA_GPUCODE_DEVICE
+#ifdef GPUCA_ALIROOT_LIB
+#include "AliTRDtrackletWord.h"
+#include "AliTRDtrackletMCM.h"
+
 GPUTRDTrackletWord::GPUTRDTrackletWord(const AliTRDtrackletWord& rhs) : mId(-1), mHCId(rhs.GetHCId()), mTrackletWord(rhs.GetTrackletWord())
 {
 }
@@ -41,7 +37,7 @@ GPUTRDTrackletWord& GPUTRDTrackletWord::operator=(const AliTRDtrackletMCM& rhs)
   return *this;
 }
 
-#endif // GPUCA_GPUCODE_DEVICE
+#endif // GPUCA_ALIROOT_LIB
 
 GPUd() int GPUTRDTrackletWord::GetYbin() const
 {

Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,15 @@ using namespace GPUCA_NAMESPACE::gpu;`
`16`	`16`
`17`	`17`	`#ifndef GPUCA_TPC_GEOMETRY_O2`
`18`	`18`
`19`		`-#include "AliTRDtrackletWord.h"`
`20`		`-#include "AliTRDtrackletMCM.h"`
`21`		`-`
`22`		`-#ifndef GPUCA_GPUCODE_DEVICE`
`23`		`-#include <new>`
`24`		`-#endif`
`25`		`-`
`26`	`19`	`GPUd() GPUTRDTrackletWord::GPUTRDTrackletWord(unsigned int trackletWord) : mId(-1), mHCId(-1), mTrackletWord(trackletWord)`
`27`	`20`	`{`
`28`	`21`	`}`
`29`	`22`	`GPUd() GPUTRDTrackletWord::GPUTRDTrackletWord(unsigned int trackletWord, int hcid, int id) : mId(id), mHCId(hcid), mTrackletWord(trackletWord) {}`
`30`	`23`
`31`		`-#ifndef GPUCA_GPUCODE_DEVICE`
	`24`	`+#ifdef GPUCA_ALIROOT_LIB`
	`25`	`+#include "AliTRDtrackletWord.h"`
	`26`	`+#include "AliTRDtrackletMCM.h"`
	`27`	`+`
`32`	`28`	`GPUTRDTrackletWord::GPUTRDTrackletWord(const AliTRDtrackletWord& rhs) : mId(-1), mHCId(rhs.GetHCId()), mTrackletWord(rhs.GetTrackletWord())`
`33`	`29`	`{`
`34`	`30`	`}`
`@@ -41,7 +37,7 @@ GPUTRDTrackletWord& GPUTRDTrackletWord::operator=(const AliTRDtrackletMCM& rhs)`
`41`	`37`	`return *this;`
`42`	`38`	`}`
`43`	`39`
`44`		`-#endif // GPUCA_GPUCODE_DEVICE`
	`40`	`+#endif // GPUCA_ALIROOT_LIB`
`45`	`41`
`46`	`42`	`GPUd() int GPUTRDTrackletWord::GetYbin() const`
`47`	`43`	`{`