Adapt to use newly introduced TPCCore package

ktf · ktf · commit 60dc08504b18 · 2025-12-15T13:12:02.000+01:00
diff --git a/Modules/TPC/include/TPC/CalPadClusterReductor.h b/Modules/TPC/include/TPC/CalPadClusterReductor.h
@@ -17,7 +17,11 @@
 #define QC_MODULE_TPC_CALPADCLUSTERDUCTOR_H
 
 #include "QualityControl/ReductorTObject.h"
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCCore/CalDet.h"
+#endif
 #include "TPCBase/CalArray.h"
 #include "TPCQC/Clusters.h"
 
diff --git a/Modules/TPC/include/TPC/ROCReductor.h b/Modules/TPC/include/TPC/ROCReductor.h
@@ -18,7 +18,11 @@
 #define QC_MODULE_TPC_ROCREDUCTOR_H
 
 #include "QualityControl/ReductorTObject.h"
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCCore/CalDet.h"
+#endif
 //#include "CCDB/TObjectWrapper.h"
 
 namespace o2::quality_control_modules::tpc
diff --git a/Modules/TPC/include/TPC/Utility.h b/Modules/TPC/include/TPC/Utility.h
@@ -20,7 +20,11 @@
 #include "QualityControl/ObjectsManager.h"
 #include "QualityControl/CustomParameters.h"
 
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCCore/CalDet.h"
+#endif
 #include "DataFormatsTPC/ClusterNative.h"
 #include "DataFormatsTPC/WorkflowHelper.h"
 #include "Framework/ProcessingContext.h"
@@ -114,4 +118,4 @@ void retrieveStatistics(std::vector<double>& values, std::vector<double>& errors
 /// \param stddev float&, reference to float that should store stddev of mean
 void calcMeanAndStddev(const std::vector<float>& values, float& mean, float& stddev);
 } // namespace o2::quality_control_modules::tpc
-#endif // QUALITYCONTROL_TPCUTILITY_H
+#endif // QUALITYCONTROL_TPCUTILITY_H
diff --git a/Modules/TPC/src/CalDetPublisher.cxx b/Modules/TPC/src/CalDetPublisher.cxx
@@ -15,8 +15,13 @@
 ///
 
 // O2 includes
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
 #include "TPCBase/CDBInterface.h"
+#else
+#include "TPCCore/Painter.h"
+#include "TPCCore/CDBInterface.h"
+#endif
 #include "TPCQC/Helpers.h"
 
 // QC includes
diff --git a/Modules/TPC/src/ClusterVisualizer.cxx b/Modules/TPC/src/ClusterVisualizer.cxx
@@ -15,8 +15,13 @@
 ///
 
 // O2 includes
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
 #include "TPCBase/CDBInterface.h"
+#else
+#include "TPCCore/Painter.h"
+#include "TPCCore/CDBInterface.h"
+#endif
 #include "TPCQC/Helpers.h"
 #include "DetectorsBase/GRPGeomHelper.h"
 
diff --git a/Modules/TPC/src/Clusters.cxx b/Modules/TPC/src/Clusters.cxx
@@ -18,7 +18,6 @@
 #include "Framework/ProcessingContext.h"
 #include "DataFormatsTPC/KrCluster.h"
 #include "DataFormatsTPC/ClusterNative.h"
-#include "TPCBase/Painter.h"
 #include "Framework/InputRecordWalker.h"
 #include "DetectorsBase/GRPGeomHelper.h"
 
diff --git a/Modules/TPC/src/IDCs.cxx b/Modules/TPC/src/IDCs.cxx
@@ -15,10 +15,16 @@
 ///
 
 // O2 includes
-#include "TPCBase/CDBInterface.h"
-#include "TPCBase/CalDet.h"
 #include "TPCBase/CalArray.h"
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
+#include "TPCBase/CDBInterface.h"
+#include "TPCBase/CalDet.h"
+#else
+#include "TPCCore/Painter.h"
+#include "TPCCore/CDBInterface.h"
+#include "TPCCore/CalDet.h"
+#endif
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
@@ -334,4 +340,4 @@ void IDCs::finalize(Trigger, framework::ServiceRegistryRef)
   }
 }
 
-} // namespace o2::quality_control_modules::tpc
+} // namespace o2::quality_control_modules::tpc
diff --git a/Modules/TPC/src/IDCsVsSACs.cxx b/Modules/TPC/src/IDCsVsSACs.cxx
@@ -15,10 +15,16 @@
 ///
 
 // O2 includes
-#include "TPCBase/CDBInterface.h"
-#include "TPCBase/CalDet.h"
 #include "TPCBase/CalArray.h"
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
+#include "TPCBase/CDBInterface.h"
+#include "TPCBase/CalDet.h"
+#else
+#include "TPCCore/Painter.h"
+#include "TPCCore/CDBInterface.h"
+#include "TPCCore/CalDet.h"
+#endif
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
diff --git a/Modules/TPC/src/LaserTracks.cxx b/Modules/TPC/src/LaserTracks.cxx
@@ -15,8 +15,13 @@
 ///
 
 // O2 includes
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
 #include "TPCBase/CDBInterface.h"
+#else
+#include "TPCCore/Painter.h"
+#include "TPCCore/CDBInterface.h"
+#endif
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
diff --git a/Modules/TPC/src/ROCReductor.cxx b/Modules/TPC/src/ROCReductor.cxx
@@ -16,7 +16,11 @@
 //
 
 #include "TPC/ROCReductor.h"
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#else
+#include "TPCCore/CalDet.h"
+#endif
 #include "TPCBase/CalArray.h"
 #include "TPCQC/CalPadWrapper.h"
 #include <TMath.h>
diff --git a/Modules/TPC/src/RawDigits.cxx b/Modules/TPC/src/RawDigits.cxx
@@ -17,7 +17,11 @@
 // O2 includes
 #include "Framework/ProcessingContext.h"
 #include "DataFormatsTPC/ClusterNative.h"
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
+#else
+#include "TPCCore/Painter.h"
+#endif
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
diff --git a/Modules/TPC/src/SACs.cxx b/Modules/TPC/src/SACs.cxx
@@ -15,7 +15,11 @@
 ///
 
 // O2 includes
+#if __has_include("TPCBase/CDBInterface.h")
 #include "TPCBase/CDBInterface.h"
+#else
+#include "TPCCore/CDBInterface.h"
+#endif
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
diff --git a/Modules/TPC/src/Utility.cxx b/Modules/TPC/src/Utility.cxx
@@ -19,8 +19,13 @@
 #include "Framework/InputRecordWalker.h"
 #include "DataFormatsTPC/ClusterNativeHelper.h"
 #include "DataFormatsTPC/TPCSectorHeader.h"
+#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
 #include "TPCBase/Painter.h"
+#else
+#include "TPCCore/CalDet.h"
+#include "TPCCore/Painter.h"
+#endif
 #include "CommonUtils/StringUtils.h"
 
 // QC includes
@@ -364,4 +369,4 @@ void calcMeanAndStddev(const std::vector<float>& values, float& mean, float& std
   }
 }
 
-} // namespace o2::quality_control_modules::tpc
+} // namespace o2::quality_control_modules::tpc
