GPU TRD: Reduce headers included in interface class

Author: davidrohr

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
 {

Detectors/TPC/dcs/CMakeLists.txt

@@ -18,7 +18,8 @@ o2_add_library(TPCdcs
                PUBLIC_LINK_LIBRARIES O2::Framework
                                      O2::DetectorsDCS
                                      O2::DataFormatsTPC
-                                     O2::TPCBase)
+                                     O2::TPCBase
+                                     O2::TPCBaseRecSim)
 
 o2_target_root_dictionary(TPCdcs
                           HEADERS include/TPCdcs/DCSProcessor.h)

Detectors/TRD/calibration/src/TrackBasedCalib.cxx

@@ -22,6 +22,8 @@
 #include "TRDBase/Geometry.h"
 #include "TRDBase/PadPlane.h"
 #include "CommonUtils/NameConf.h"
+#include "DataFormatsTPC/TrackTPC.h"
+#include "ReconstructionDataFormats/TrackTPCITS.h"
 #include <fairlogger/Logger.h>
 
 using namespace o2::trd;

Detectors/TRD/pid/include/TRDPID/LQND.h

@@ -27,6 +27,8 @@
 #include "DetectorsBase/Propagator.h"
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/TrackParametrization.h"
+#include "DataFormatsTPC/TrackTPC.h"
+#include "ReconstructionDataFormats/TrackTPCITS.h"
 
 #include <memory>
 #include <vector>

Detectors/TRD/workflow/io/CMakeLists.txt

@@ -23,7 +23,7 @@ o2_add_library(TRDWorkflowIO
                        src/TRDCalibWriterSpec.cxx
                        src/TRDPHReaderSpec.cxx
                        include/TRDWorkflowIO/KrClusterWriterSpec.h
-               PUBLIC_LINK_LIBRARIES O2::DataFormatsTRD O2::SimulationDataFormat O2::DPLUtils O2::GPUDataTypes O2::DataFormatsTPC)
+               PUBLIC_LINK_LIBRARIES O2::DataFormatsTRD O2::SimulationDataFormat O2::DPLUtils O2::GPUDataTypes O2::DataFormatsTPC O2::DetectorsRaw)
 
 
 o2_add_executable(digit-reader-workflow

GPU/GPUTracking/CMakeLists.txt

@@ -354,6 +354,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
                                        O2::ReconstructionDataFormats
                                        O2::TPCFastTransformation
                  PRIVATE_LINK_LIBRARIES O2::DataFormatsTPC
+                                        O2::TPCBase
                  SOURCES ${SRCS_DATATYPES})
   target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB)
 

GPU/GPUTracking/DataTypes/GPUTRDInterfaceO2Track.h

@@ -21,17 +21,24 @@ namespace o2::gpu
 {
 template <typename T>
 class trackInterface;
+template <typename T>
+class GPUTRDTrack_t;
 class GPUTPCGMMergedTrack;
 namespace gputpcgmmergertypes
 {
 struct GPUTPCOuterParam;
 } // namespace gputpcgmmergertypes
 } // namespace o2::gpu
+namespace o2::tpc
+{
+class TrackTPC;
+}
+namespace o2::dataformats
+{
+class TrackTPCITS;
+}
 
 #include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/TrackTPCITS.h"
-#include "DataFormatsTPC/TrackTPC.h"
-#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/TrackLTIntegral.h"
 #include "CommonConstants/LHCConstants.h"
 
@@ -44,8 +51,11 @@ class trackInterface<o2::track::TrackParCov> : public o2::track::TrackParCov
  public:
   GPUdDefault() trackInterface() = default;
   trackInterface(const o2::track::TrackParCov& param) = delete;
-  GPUd() trackInterface(const o2::dataformats::TrackTPCITS& trkItsTpc) : o2::track::TrackParCov(trkItsTpc.getParamOut()) {}
-  GPUd() trackInterface(const o2::tpc::TrackTPC& trkTpc) : o2::track::TrackParCov(trkTpc.getParamOut()) {}
+  trackInterface(const GPUTRDTrack_t<o2::gpu::trackInterface<o2::track::TrackParCov>>& param) = delete;
+  template <class T>
+  GPUd() trackInterface(const T& trkSrc) : o2::track::TrackParCov(trkSrc.getParamOut())
+  {
+  }
 
   GPUd() void set(float x, float alpha, const float* param, const float* cov)
   {

GPU/GPUTracking/DataTypes/GPUTRDTrack.inc

@@ -43,20 +43,20 @@ GPUd() void GPUTRDTrack_t<T>::initialize()
 #include "DataFormatsTPC/TrackTPC.h"
 
 template <typename T>
-GPUd() GPUTRDTrack_t<T>::GPUTRDTrack_t(const o2::dataformats::TrackTPCITS& t) : T(t)
+GPUd() GPUTRDTrack_t<T>::GPUTRDTrack_t(const o2::dataformats::TrackTPCITS& t) : T(static_cast<const T&>(t))
 {
   initialize();
 }
 
 template <typename T>
-GPUd() GPUTRDTrack_t<T>::GPUTRDTrack_t(const o2::tpc::TrackTPC& t) : T(t)
+GPUd() GPUTRDTrack_t<T>::GPUTRDTrack_t(const o2::tpc::TrackTPC& t) : T(static_cast<const T&>(t))
 {
   initialize();
 }
 
 template <typename T>
 GPUd() GPUTRDTrack_t<T>::GPUTRDTrack_t(const GPUTRDTrack_t<T>& t)
-  : T(t), mChi2(t.mChi2), mSignal(t.mSignal), mRefGlobalTrackId(t.mRefGlobalTrackId), mCollisionId(t.mCollisionId), mFlags(t.mFlags), mIsCrossingNeighbor(t.mIsCrossingNeighbor)
+  : T(static_cast<const T&>(t)), mChi2(t.mChi2), mSignal(t.mSignal), mRefGlobalTrackId(t.mRefGlobalTrackId), mCollisionId(t.mCollisionId), mFlags(t.mFlags), mIsCrossingNeighbor(t.mIsCrossingNeighbor)
 {
   // copy constructor
   for (int32_t i = 0; i < kNLayers; ++i) {

Generators/CMakeLists.txt

@@ -52,7 +52,7 @@ o2_add_library(Generators
                        $<$<BOOL:${HepMC3_FOUND}>:src/AODToHepMC.cxx>
                        $<$<AND:$<BOOL:${pythia_FOUND}>,$<BOOL:${HepMC3_FOUND}>>:src/GeneratorHybrid.cxx>
                        $<$<AND:$<BOOL:${pythia_FOUND}>,$<BOOL:${HepMC3_FOUND}>>:src/GeneratorHybridParam.cxx>
-               PUBLIC_LINK_LIBRARIES FairRoot::Base O2::SimConfig O2::CommonUtils O2::DetectorsBase O2::ZDCBase
+               PUBLIC_LINK_LIBRARIES FairRoot::Base O2::SimConfig O2::CommonUtils O2::DetectorsBase O2::ZDCBase O2::DetectorsRaw
                                      O2::SimulationDataFormat ${pythiaTarget} ${hepmcTarget}
                                      FairRoot::Gen
                                      onnxruntime::onnxruntime