From 1f702353b5939eb3e99b38e6a479d73e521389e2 Mon Sep 17 00:00:00 2001
From: Pascal Raisig <praisig@ikf.uni-frankfurt.de>
Date: Tue, 13 Jul 2021 16:15:58 +0200
Subject: [PATCH] Merge some hickup with stash pop
---
reco/base/CbmRecoUnpackAlgo.tmpl | 9 ++++++---
reco/base/CbmRecoUnpackConfig.tmpl | 2 +-
reco/detectors/trd/CMakeLists.txt | 3 +++
reco/detectors/trd/CbmTrdRecoLinkDef.h | 3 +++
reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h | 11 -----------
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/reco/base/CbmRecoUnpackAlgo.tmpl b/reco/base/CbmRecoUnpackAlgo.tmpl
index e17f69ce5c..c3afb0b35b 100644
--- a/reco/base/CbmRecoUnpackAlgo.tmpl
+++ b/reco/base/CbmRecoUnpackAlgo.tmpl
@@ -40,7 +40,7 @@
#include <vector>
-template<class TOutput, class TOptOutA = std::nullptr_t, class TOptOutB = std::nullptr_t>
+template<typename TOutput, typename TOptOutA = std::nullptr_t, typename TOptOutB = std::nullptr_t>
class CbmRecoUnpackAlgo {
public:
@@ -203,7 +203,7 @@ protected:
* @return true
* @return false
*/
- virtual bool setDerivedTsParameters(size_t itimeslice) = 0;
+ virtual bool setDerivedTsParameters(size_t /*itimeslice*/) { return true; }
/**
@@ -303,7 +303,10 @@ public:
* @return fParContVec
*/
virtual std::vector<std::pair<std::string, std::shared_ptr<FairParGenericSet>>>*
- GetParContainerRequest(std::string geoTag, std::uint32_t runId) = 0;
+ GetParContainerRequest(std::string /*geoTag*/, std::uint32_t /*runId*/)
+ {
+ return {};
+ }
/**
* @brief Intialisation at begin of run.
diff --git a/reco/base/CbmRecoUnpackConfig.tmpl b/reco/base/CbmRecoUnpackConfig.tmpl
index aede09bf68..bdbcaf908c 100644
--- a/reco/base/CbmRecoUnpackConfig.tmpl
+++ b/reco/base/CbmRecoUnpackConfig.tmpl
@@ -36,7 +36,7 @@
#include <memory>
#include <vector>
-template<class TAlgo, class TOutput, class TOptOutA = std::nullptr_t, class TOptOutB = std::nullptr_t>
+template<typename TAlgo, typename TOutput, typename TOptOutA = std::nullptr_t, typename TOptOutB = std::nullptr_t>
class CbmRecoUnpackConfig {
public:
diff --git a/reco/detectors/trd/CMakeLists.txt b/reco/detectors/trd/CMakeLists.txt
index 2509f10e18..09e02d3b53 100644
--- a/reco/detectors/trd/CMakeLists.txt
+++ b/reco/detectors/trd/CMakeLists.txt
@@ -59,6 +59,9 @@ unpack/CbmTrdUnpackAlgoR.cxx
unpack/CbmTrdUnpackAlgoLegacy2020R.cxx
unpack/CbmTrdUnpackMonitor.cxx
+unpack/CbmTrdUnpackAlgo2D.cxx
+unpack/CbmTrdUnpackConfig2D.cxx
+
qa/CbmTrdClusterizerFastQa.cxx
qa/CbmTrdHitDensityQa.cxx
qa/CbmTrdHitProducerClusterQa.cxx
diff --git a/reco/detectors/trd/CbmTrdRecoLinkDef.h b/reco/detectors/trd/CbmTrdRecoLinkDef.h
index 7c363fbfa7..449f6f2ca0 100644
--- a/reco/detectors/trd/CbmTrdRecoLinkDef.h
+++ b/reco/detectors/trd/CbmTrdRecoLinkDef.h
@@ -33,6 +33,9 @@
#pragma link C++ class CbmTrdUnpackConfig + ;
#pragma link C++ class CbmTrdUnpackMonitor + ;
+#pragma link C++ class CbmTrdUnpackAlgo2D + ;
+#pragma link C++ class CbmTrdUnpackConfig2D + ;
+
#pragma link C++ class CbmTrdElectronsTrainAnn + ;
#pragma link C++ class CbmTrdSetTracksPidWkn + ;
#pragma link C++ class CbmTrdSetTracksPidModWkn + ;
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h
index f5dfc2e627..24e7acc474 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h
@@ -168,17 +168,6 @@ protected:
*/
Bool_t initParSet(CbmMcbm2020TrdTshiftPar* parset);
- /**
- * @brief Pointer to the RawMsg vector connected to the framework, setted from the task/device
- * @remark This could be templated if we want to use this class as reference for all systems
- */
- std::vector<CbmTrdRawMessageSpadic>* fOutRawSpadicVec = nullptr;
-
- /**
- * @brief Pointer to the Spadic info message vector connected to the framework, setted from the task/device
- * @remark This could be templated if we want to use this class as reference for all systems
- */
- std::vector<std::pair<size_t, size_t>>* fOutInfoSpadicVec = nullptr;
// Monitoring
/** @brief Potential (online) monitor for the unpacking process */
--
GitLab