Merge some hickup with stash pop

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.

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:

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

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 + ;

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 */