Include What You Use

Author: vkucera

Tools/KFparticle/KFUtilities.h

@@ -22,17 +22,26 @@
 #define HomogeneousField
 #endif
 
-#include <utility>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include <ReconstructionDataFormats/PID.h>
+#include <ReconstructionDataFormats/Track.h>
+#include <ReconstructionDataFormats/TrackParametrizationWithError.h>
 
 #include <TDatabasePDG.h> // FIXME
 
-#include "KFParticle.h"
-#include "KFPTrack.h"
-#include "KFPVertex.h"
-#include "KFParticleBase.h"
-#include "KFVertex.h"
+#include <KFPTrack.h>
+#include <KFPVertex.h>
+#include <KFParticle.h>
+#include <KFParticleBase.h>
+#include <fairlogger/Logger.h>
 
-#include "Common/Core/RecoDecay.h"
+#include <array>
+#include <cmath>
+#include <cstdint>
+#include <stdexcept>
+#include <utility>
 
 /// @brief Function to create a KFPVertex from the collision table in the AO2Ds.
 /// The Multiplicity table is required to set the number of real PV Contributors

Tools/ML/MlResponse.h

@@ -17,21 +17,25 @@
 #ifndef TOOLS_ML_MLRESPONSE_H_
 #define TOOLS_ML_MLRESPONSE_H_
 
+#include "Tools/ML/model.h"
+
 #if __has_include(<onnxruntime/core/session/onnxruntime_cxx_api.h>)
 #include <onnxruntime/core/session/experimental_onnxruntime_cxx_api.h>
 #else
 #include <onnxruntime_cxx_api.h>
 #endif
 
+#include <CCDB/CcdbApi.h>
+#include <Framework/Array2D.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "CCDB/CcdbApi.h"
-#include "Framework/Array2D.h"
-
-#include "Tools/ML/model.h"
-
 namespace o2
 {
 namespace cuts_ml

Tools/ML/model.cxx

@@ -17,9 +17,27 @@
 /// \brief    A general-purpose class with functions for ONNX model applications
 ///
 
-// ONNX includes
 #include "Tools/ML/model.h"
 
+#include <onnxruntime_c_api.h>
+#if __has_include(<onnxruntime/core/session/onnxruntime_cxx_api.h>)
+#include <onnxruntime/core/session/experimental_onnxruntime_cxx_api.h>
+#else
+#include <onnxruntime_cxx_api.h>
+#endif
+
+#include <TSystem.h>
+
+#include <fairlogger/Logger.h>
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
 namespace o2
 {
 

Tools/ML/model.h

@@ -20,23 +20,23 @@
 #ifndef TOOLS_ML_MODEL_H_
 #define TOOLS_ML_MODEL_H_
 
-// C++ and system includes
+#include <onnxruntime_c_api.h>
 #if __has_include(<onnxruntime/core/session/onnxruntime_cxx_api.h>)
 #include <onnxruntime/core/session/experimental_onnxruntime_cxx_api.h>
 #else
 #include <onnxruntime_cxx_api.h>
 #endif
-#include <vector>
-#include <string>
-#include <memory>
-#include <map>
-#include <algorithm>
 
-// ROOT includes
-#include "TSystem.h"
+#include <fairlogger/Logger.h>
 
-// O2 includes
-#include "Framework/Logger.h"
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2
 {