GPU: Fix includes of certain headers (fix order, avoid ROOT in GPU code)

Author: davidrohr

GPU/GPUTracking/DataTypes/CalibdEdxContainer.cxx

@@ -12,14 +12,13 @@
 /// \file  CalibdEdxContainer.cxx
 /// \author Matthias Kleiner <mkleiner@ikf.uni-frankfurt.de>
 
-#include "CalibdEdxContainer.h"
-
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
+#if !defined(GPUCA_STANDALONE)
 #include "TFile.h"
 #include "TPCBase/CalDet.h"
 #include "Framework/Logger.h"
 #include "clusterFinderDefs.h"
 #endif
+#include "CalibdEdxContainer.h"
 
 using namespace GPUCA_NAMESPACE::gpu;
 using namespace o2::tpc;

GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx

@@ -9,6 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Rtypes.h"
 #include "CalibdEdxTrackTopologyPol.h"
 
 #include <cstddef>

GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologySpline.cxx

@@ -14,11 +14,10 @@
 ///
 /// \author  Matthias Kleiner <matthias.kleiner@cern.ch>
 
-#include "CalibdEdxTrackTopologySpline.h"
-
 #if !defined(GPUCA_STANDALONE)
 #include "TFile.h"
 #endif
+#include "CalibdEdxTrackTopologySpline.h"
 
 using namespace GPUCA_NAMESPACE::gpu;
 using namespace o2::tpc;

GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologySpline.h

@@ -19,12 +19,12 @@
 
 #include "FlatObject.h"
 #include "Spline.h"
+#include "GPUCommonRtypes.h"
 #ifdef GPUCA_HAVE_O2HEADERS
 #include "DataFormatsTPC/Defs.h"
 #endif
 
 #if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) // code invisible on GPU and in the standalone compilation
-#include "Rtypes.h"                                       // for ClassDefNV
 #include <fmt/format.h>
 #endif
 

GPU/GPUTracking/Interface/GPUO2InterfaceQA.cxx

@@ -12,11 +12,11 @@
 /// \file GPUO2InterfaceQA.cxx
 /// \author David Rohr
 
+#include "TGraphAsymmErrors.h"
 #include "GPUParam.h"
 #include "GPUQA.h"
 #include "GPUO2InterfaceConfiguration.h"
 #include "GPUO2InterfaceQA.h"
-#include "TGraphAsymmErrors.h"
 
 using namespace o2::gpu;
 using namespace o2::tpc;

GPU/GPUTracking/Refit/GPUTrackingRefitKernel.cxx

@@ -12,9 +12,9 @@
 /// \file GPUTrackingRefitKernel.cxx
 /// \author David Rohr
 
+#include "GPUROOTDump.h"
 #include "GPUTrackingRefitKernel.h"
 #include "GPUTrackingRefit.h"
-#include "GPUROOTDump.h"
 
 using namespace GPUCA_NAMESPACE::gpu;