From 6d65810186b6c21a3a8b34c8ed19b32f5b61dce0 Mon Sep 17 00:00:00 2001
From: Pascal Raisig <praisig@ikf.uni-frankfurt.de>
Date: Fri, 16 Jul 2021 19:58:55 +0200
Subject: [PATCH] Fix the header includes for StsAlgo
Had to include some directorie in the L1 CmakeList
---
reco/L1/CMakeLists.txt | 3 +++
reco/detectors/sts/CMakeLists.txt | 1 -
reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx | 4 +---
reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx | 5 ++---
reco/detectors/sts/unpack/CbmStsUnpackMonitor.h | 4 +---
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 59838e54fd..5088bb30fc 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -24,6 +24,7 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/rich/fitter
${CBMBASE_DIR}
${CBMDATA_DIR}
+${CBMDATA_DIR}/raw
${CBMDATA_DIR}/sts
${CBMDATA_DIR}/much
${CBMDATA_DIR}/mvd
@@ -32,6 +33,8 @@ ${CBMDATA_DIR}/tof
${CBMDATA_DIR}/rich
${CBMDATA_DIR}/global
+${CBMROOT_SOURCE_DIR}/core/qa
+
${CBMROOT_SOURCE_DIR}/rich/reco/fitter
${CBMROOT_SOURCE_DIR}/reco/L1
diff --git a/reco/detectors/sts/CMakeLists.txt b/reco/detectors/sts/CMakeLists.txt
index b93c508090..7c02555e7a 100644
--- a/reco/detectors/sts/CMakeLists.txt
+++ b/reco/detectors/sts/CMakeLists.txt
@@ -39,7 +39,6 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/sts/unpack
${CBMROOT_SOURCE_DIR}/reco/base
#QA
-${CBMROOT_SOURCE_DIR}/qa
${CBMROOT_SOURCE_DIR}/core/qa
# Base
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
index 75a4282f6b..3d85f9a283 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
@@ -13,9 +13,7 @@
#include <cstdint>
#include <iomanip>
-// FIXME
-// #include "StsXyterFinalHit.h"
-#include "raw/StsXyterFinalHit.h"
+#include "StsXyterFinalHit.h"
CbmStsUnpackAlgo::CbmStsUnpackAlgo() : CbmRecoUnpackAlgo("CbmStsUnpackAlgo") {}
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
index adbb6d3540..07acc65f5a 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
@@ -1,8 +1,6 @@
#include "CbmStsUnpackMonitor.h"
-// FIXME
-// #include "CbmQaCanvas.h"
-#include "../qa/CbmQaCanvas.h"
+#include "CbmQaCanvas.h"
#include <FairRun.h>
#include <FairRunOnline.h>
@@ -312,6 +310,7 @@ Bool_t CbmStsUnpackMonitor::ResetMsComponentSizeHistos(UInt_t component)
fvhMsSize[component]->Reset();
fvhMsSizeTime[component]->Reset();
}
+ return kTRUE;
}
Bool_t CbmStsUnpackMonitor::ResetHistograms()
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
index 41e99d6f0a..ab1536a39a 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
@@ -17,9 +17,7 @@
#include <cstdint>
-// FIXME
-// #include "StsXyterMessage.h"
-#include "raw/StsXyterMessage.h"
+#include "StsXyterMessage.h"
/** @remark On pointers to histograms: Why not use shared pointers here, than you do not need to take care of deleting them. Right now I think you have a massive memory leak. PR */
--
GitLab