Fixing build issues

Author: atriolo

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

@@ -14,6 +14,7 @@
 
 #include <memory>
 #include <DetectorsCommonDataFormats/DetMatrixCache.h>
+#include "DetectorsCommonDataFormats/DetID.h"
 
 namespace o2
 {
@@ -127,10 +128,13 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
 
   TString getMatrixPath(int index) const;
 
+#ifdef ENABLE_UPGRADES
   static const char* composeSymNameTRK(int d)
   {
     return Form("%s_%d", o2::detectors::DetID(o2::detectors::DetID::TRK).getName(), d);
   }
+#endif
+
   static const char* composeSymNameLayer(int d, int layer);
   static const char* composeSymNameStave(int d, int layer);
   static const char* composeSymNameChip(int d, int lr);

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

@@ -367,10 +367,12 @@ void GeometryTGeo::fillMatrixCache(int mask)
 
 //__________________________________________________________________________
 
+#ifdef ENABLE_UPGRADES
 const char* GeometryTGeo::composeSymNameLayer(int d, int lr)
 {
   return Form("%s/%s%d", composeSymNameTRK(d), getTRKLayerPattern(), lr);
 }
+#endif
 
 const char* GeometryTGeo::composeSymNameStave(int d, int lr)
 {

Detectors/Upgrades/ALICE3/TRK/base/src/TRKBaseLinkDef.h

@@ -15,8 +15,10 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::trk::TRKBaseParam> + ;
+
 #pragma link C++ class o2::trk::GeometryTGeo +
 #pragma link C++ class o2::trk::TRKBaseParam + ;
-#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::trk::TRKBaseParam> + ;
+#pragma link C++ class o2::trk::SegmentationChip + ;
 
 #endif

Detectors/Upgrades/ALICE3/TRK/macros/test/CMakeLists.txt

@@ -10,10 +10,12 @@
 # or submit itself to any jurisdiction.
 
 o2_add_test_root_macro(CheckDigits.C
-                       PUBLIC_LINK_LIBRARIES O2::ITSMFTSimulation
+                       PUBLIC_LINK_LIBRARIES O2::ITSMFTBase
+                                             O2::ITSMFTSimulation
                                              O2::TRKBase
                                              O2::TRKSimulation
                                              O2::MathUtils
                                              O2::SimulationDataFormat
                                              O2::DetectorsBase
-                       LABELS its COMPILE_ONLY)
+                                             O2::Steer
+                       LABELS trk COMPILE_ONLY)

Detectors/Upgrades/ALICE3/TRK/macros/test/CheckDigits.C

@@ -20,11 +20,9 @@
 #include <TString.h>
 #include <TTree.h>
 
-#include <vector>
-#define ENABLE_UPGRADES
+#include "TRKBase/SegmentationChip.h"
 #include "TRKBase/GeometryTGeo.h"
 #include "DataFormatsITSMFT/Digit.h"
-#include "TRKBase/SegmentationChip.h"
 #include "ITSMFTSimulation/Hit.h"
 #include "MathUtils/Utils.h"
 #include "SimulationDataFormat/ConstMCTruthContainer.h"
@@ -36,6 +34,8 @@
 
 #endif
 
+#define ENABLE_UPGRADES
+
 void CheckDigits(std::string digifile = "trkdigits.root", std::string hitfile = "o2sim_HitsTRK.root", std::string inputGeom = "", std::string paramfile = "o2sim_par.root")
 {