Merge f3a1fef into sapling-pr-archive-ktf

Author: ktf

Common/Field/src/MagFieldFast.cxx

@@ -16,12 +16,10 @@
 #include "Field/MagFieldFast.h"
 #include <GPUCommonLogger.h>
 
-#ifndef GPUCA_GPUCODE_DEVICE
 #include <cmath>
 #include <fstream>
 #include <sstream>
 using namespace std;
-#endif
 
 using namespace o2::field;
 

Common/MathUtils/include/MathUtils/detail/Bracket.h

@@ -17,7 +17,7 @@
 #define ALICEO2_BRACKET_H
 
 #include <GPUCommonRtypes.h>
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 #include <string>
 #include <sstream>
 #endif
@@ -76,7 +76,7 @@ class Bracket
   Relation isOutside(T t, T tErr) const;
   Relation isOutside(T t) const;
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
   std::string asString() const;
 #endif
 
@@ -247,7 +247,7 @@ inline typename Bracket<T>::Relation Bracket<T>::isOutside(T t) const
   return t < mMin ? Below : (t > mMax ? Above : Inside);
 }
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 template <typename T>
 std::string Bracket<T>::asString() const
 {

Common/Utils/src/DebugStreamer.cxx

@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "CommonUtils/DebugStreamer.h"
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
 #include <thread>
 #include <fmt/format.h>
 #include "TROOT.h"
 #include "TKey.h"
 #include <random>
 #include "Framework/Logger.h"
-#endif
 
 O2ParamImpl(o2::utils::ParameterDebugStreamer);
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) && defined(DEBUG_STREAMER)
+#if defined(DEBUG_STREAMER)
 
 o2::utils::DebugStreamer::DebugStreamer()
 {

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

@@ -42,14 +42,12 @@ class CalibdEdxCorrection
   static constexpr int FitSize = 288; ///< Number of fitted corrections
   static constexpr int ParamSize = 8; ///< Number of params per fit
 
-#if !defined(GPUCA_ALIGPUCODE)
+#if !defined(GPUCA_GPUCODE)
   CalibdEdxCorrection()
   {
     clear();
   }
   CalibdEdxCorrection(std::string_view fileName) { loadFromFile(fileName); }
-#else
-  CalibdEdxCorrection() = default;
 #endif
   ~CalibdEdxCorrection() = default;
 

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

@@ -28,7 +28,7 @@ namespace constants
 constexpr int MAXSECTOR = 36;
 
 // the number of global pad rows
-#if defined(GPUCA_STANDALONE) && !defined(GPUCA_O2_LIB) && !defined(GPUCA_TPC_GEOMETRY_O2)
+#if defined(GPUCA_STANDALONE) && defined(GPUCA_RUN2)
 constexpr int MAXGLOBALPADROW = 159; // Number of pad rows in Run 2, used for GPU TPC tests with Run 2 data
 #else
 constexpr int MAXGLOBALPADROW = 152; // Correct number of pad rows in Run 3

DataFormats/Detectors/TPC/src/CalibdEdxCorrection.cxx

@@ -14,13 +14,15 @@
 #include <algorithm>
 #include <string_view>
 
+#ifndef GPUCA_STANDALONE
 // o2 includes
 #include "Framework/Logger.h"
 #include "DataFormatsTPC/Defs.h"
 #include "CommonUtils/TreeStreamRedirector.h"
 
 // root includes
 #include "TFile.h"
+#endif
 
 using namespace o2::tpc;
 
@@ -37,6 +39,8 @@ void CalibdEdxCorrection::clear()
   mDims = -1;
 }
 
+#ifndef GPUCA_STANDALONE
+
 void CalibdEdxCorrection::writeToFile(std::string_view fileName, std::string_view objName) const
 {
   std::unique_ptr<TFile> file(TFile::Open(fileName.data(), "recreate"));
@@ -181,3 +185,5 @@ void CalibdEdxCorrection::setUnity()
   }
   mDims = 0;
 }
+
+#endif // GPUCA_STANDALONE

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

@@ -16,6 +16,7 @@
 #define O2_DATAFORMATS_TRACK_TRD_H
 
 #include "GPUTRDTrack.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 namespace o2
 {

DataFormats/Detectors/TRD/src/Tracklet64.cxx

@@ -25,7 +25,6 @@ void Tracklet64::print() const
        HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getROB(), getMCM(), getPadRow(), getPadCol(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2(), getFormat());
 }
 
-#ifndef GPUCA_GPUCODE_DEVICE
 void Tracklet64::printStream(std::ostream& stream) const
 {
   stream << "Tracklet64 : 0x" << std::hex << getTrackletWord();
@@ -50,7 +49,5 @@ bool operator<(const Tracklet64& lhs, const Tracklet64& rhs)
          (lhs.getDetector() == rhs.getDetector() && lhs.getROB() == rhs.getROB() && lhs.getMCM() == rhs.getMCM() && lhs.getPadRow() == rhs.getPadRow() && lhs.getPadCol() < rhs.getPadCol());
 }
 
-#endif // GPUCA_GPUCODE_DEVICE
-
 } // namespace trd
 } // namespace o2

DataFormats/Reconstruction/include/ReconstructionDataFormats/PrimaryVertex.h

@@ -42,7 +42,7 @@ class PrimaryVertex : public Vertex<TimeStampWithError<float, float>>
   float getZMAD() const { return mZMAD; }
   void setZMAD(float v) { mZMAD = v; }
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
   void print() const;
   std::string asString() const;
 #endif
@@ -56,7 +56,7 @@ class PrimaryVertex : public Vertex<TimeStampWithError<float, float>>
   ClassDefNV(PrimaryVertex, 2);
 };
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 std::ostream& operator<<(std::ostream& os, const o2::dataformats::PrimaryVertex& v);
 #endif
 

DataFormats/Reconstruction/include/ReconstructionDataFormats/PrimaryVertexExt.h

@@ -36,15 +36,15 @@ struct PrimaryVertexExt : public PrimaryVertex {
   int getNSrcA(int i) const { return nSrcA[i]; }
   int getNSrcAU(int i) const { return nSrcAU[i]; }
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
   void print() const;
   std::string asString() const;
 #endif
 
   ClassDefNV(PrimaryVertexExt, 6);
 };
 
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 std::ostream& operator<<(std::ostream& os, const o2::dataformats::PrimaryVertexExt& v);
 #endif