Fix header includes for RICH and PSD thanks to Florian

reco/detectors/psd/CMakeLists.txt

@@ -2,13 +2,15 @@ set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/unpack
   
+  ${CMAKE_SOURCE_DIR}/core/detectors/psd
+
   ${CBMDATA_DIR}
   ${CBMDATA_DIR}/global
   ${CBMDATA_DIR}/base
   ${CBMDATA_DIR}/psd
   ${CBMDATA_DIR}/raw
   ${CBMBASE_DIR}
-  ${CBMDETECTORBASE_DIR}/psd
+  
 
   ${CBMROOT_SOURCE_DIR}/reco/base
 )

reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx

@@ -14,9 +14,9 @@
 #include <cstdint>
 #include <numeric>
 
-#include "../../core/detectors/psd/PronyFitter.h"
-#include "raw/PsdGbtReader-v0.00.h"
-#include "raw/PsdGbtReader-v1.00.h"
+#include "PronyFitter.h"
+#include "PsdGbtReader-v0.00.h"
+#include "PsdGbtReader-v1.00.h"
 
 CbmPsdUnpackAlgo::CbmPsdUnpackAlgo() : CbmRecoUnpackAlgo(fgkFlesSubsystemIdTrdR, "CbmPsdUnpackAlgo") {}
 

reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h

@@ -21,7 +21,7 @@
 #ifndef CbmPsdUnpackAlgo_H
 #define CbmPsdUnpackAlgo_H
 
-#include "../../core/detectors/psd/CbmMcbm2018PsdPar.h"
+#include "CbmMcbm2018PsdPar.h"
 #include "CbmPsdDigi.h"
 #include "CbmPsdDsp.h"
 #include "CbmRecoUnpackAlgo.tmpl"

reco/detectors/rich/CMakeLists.txt

@@ -12,7 +12,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/alignment
 ${CMAKE_CURRENT_SOURCE_DIR}/mcbm
 ${CMAKE_CURRENT_SOURCE_DIR}/unpack
 
-${CBMDETECTORBASE_DIR}/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
 
 ${CBMROOT_SOURCE_DIR}/reco/base
 

reco/detectors/rich/unpack/CbmRichUnpackAlgo.h

@@ -21,8 +21,7 @@
 #ifndef CbmRichUnpackAlgo_H
 #define CbmRichUnpackAlgo_H
 
-// #include "CbmMcbm2018RichPar.h"
-#include "../../core/detectors/rich/CbmMcbm2018RichPar.h"
+#include "CbmMcbm2018RichPar.h"
 #include "CbmRecoUnpackAlgo.tmpl"
 #include "CbmRichDigi.h"
 
@@ -33,6 +32,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <iomanip>
 #include <memory>
 #include <utility>
 

reco/steer/CMakeLists.txt

@@ -35,13 +35,16 @@ ${CBMROOT_SOURCE_DIR}/core/data
 ${CBMROOT_SOURCE_DIR}/core/data/raw
 ${CBMROOT_SOURCE_DIR}/core/data/base
 ${CBMROOT_SOURCE_DIR}/core/data/psd
-${CBMROOT_SOURCE_DIR}/core/detectors/psd
 ${CBMROOT_SOURCE_DIR}/core/data/rich
 ${CBMROOT_SOURCE_DIR}/core/data/sts
 # ${CBMROOT_SOURCE_DIR}/core/data/tof
 ${CBMROOT_SOURCE_DIR}/core/data/trd
-${CBMROOT_SOURCE_DIR}/core/detectors/trd
 
+${CBMROOT_SOURCE_DIR}/core/detectors/psd
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/sts
+# ${CBMROOT_SOURCE_DIR}/core/detectors/tof
+${CBMROOT_SOURCE_DIR}/core/detectors/trd