MQ/mcbm/runMcbmEvtBuilderWin.cxx

@@ -19,7 +19,7 @@ void addCustomOptions(bpo::options_description& options)
   options.add_options()("IgnTsOver", bpo::value<bool>()->default_value(false), "Ignore TS overlap if true");
   options.add_options()("EvtOverMode", bpo::value<std::string>()->default_value("NoOverlap"),
                         "Set the event overlap mode, use string matching an EOverlapMode ");
-  options.add_options()("RefDet", bpo::value<std::string>()->default_value("kT0"),
+  options.add_options()("RefDet", bpo::value<std::string>()->default_value("kBmon"),
                         "Set the reference (seed) detector, use string matching an ECbmModuleId ");
   options.add_options()("AddDet", bpo::value<std::vector<std::string>>()->multitoken()->composing(),
                         "Add a detector for digis selection, use string matching an ECbmModuleId ");

MQ/monitor/CMakeLists.txt

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerMonitor.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerMonitor.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerT0Monitor2020.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerT0Monitor2020.sh)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerBmonMonitor2020.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerBmonMonitor2020.sh)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerTofMonitor2020.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerTofMonitor2020.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerT0Monitor2021.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerT0Monitor2021.sh)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerBmonMonitor2021.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerBmonMonitor2021.sh)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerTofMonitor2021.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerTofMonitor2021.sh)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQSamplerPsdMonitor2021.sh.in ${CMAKE_BINARY_DIR}/bin/MQ/topologies/startMQSamplerPsdMonitor2021.sh)
 
@@ -29,7 +29,6 @@ set(PUBLIC_DEPS
 set(PRIVATE_DEPS
   CbmFlibFlesTools
   CbmFlibMcbm2018
-  FairMQ::Tools
   FairRoot::ParBase
   Boost::serialization
   Boost::program_options
@@ -45,8 +44,8 @@ set(INTERFACE_DEPS
 
 
 
-set(EXE_NAME T0MonitorMcbm2018)
-set(SRCS CbmDeviceMonitorT0.cxx runMonitorT0.cxx)
+set(EXE_NAME BmonMonitorMcbm2018)
+set(SRCS CbmDeviceMonitorBmon.cxx runMonitorBmon.cxx)
 
 set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
 set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
@@ -63,8 +62,8 @@ set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
 
-set(EXE_NAME T0MonitorReqMcbm)
-set(SRCS CbmDeviceMonitorReqT0.cxx runMonitorReqT0.cxx)
+set(EXE_NAME BmonMonitorReqMcbm)
+set(SRCS CbmDeviceMonitorReqBmon.cxx runMonitorReqBmon.cxx)
 
 set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
 set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
@@ -108,16 +107,16 @@ set(CMAKE_BINARY_DIR ${CMAKE_INSTALL_PREFIX})
 
 # Configure file for installation directory
 configure_file(${MY_SOURCE_DIR}/startMQSamplerMonitor.sh.in        ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerMonitor.sh)
-configure_file(${MY_SOURCE_DIR}/startMQSamplerT0Monitor2020.sh.in  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerT0Monitor2020.sh)
+configure_file(${MY_SOURCE_DIR}/startMQSamplerBmonMonitor2020.sh.in  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerBmonMonitor2020.sh)
 configure_file(${MY_SOURCE_DIR}/startMQSamplerTofMonitor2020.sh.in ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerTofMonitor2020.sh)
-configure_file(${MY_SOURCE_DIR}/startMQSamplerT0Monitor2021.sh.in  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerT0Monitor2021.sh)
+configure_file(${MY_SOURCE_DIR}/startMQSamplerBmonMonitor2021.sh.in  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerBmonMonitor2021.sh)
 configure_file(${MY_SOURCE_DIR}/startMQSamplerTofMonitor2021.sh.in ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerTofMonitor2021.sh)
 configure_file(${MY_SOURCE_DIR}/startMQSamplerPsdMonitor2021.sh.in ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerPsdMonitor2021.sh)
 
 install(PROGRAMS ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerMonitor.sh
-                 ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerT0Monitor2020.sh
+                 ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerBmonMonitor2020.sh
                  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerTofMonitor2020.sh
-                 ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerT0Monitor2021.sh
+                 ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerBmonMonitor2021.sh
                  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerTofMonitor2021.sh
                  ${TMPDIR}/bin/MQ/topologies/install/startMQSamplerPsdMonitor2021.sh
         DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/MQ/topologies

MQ/monitor/CbmDeviceMonitorT0.cxx → MQ/monitor/CbmDeviceMonitorBmon.cxx

@@ -3,16 +3,16 @@
    Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 /**
- * CbmDeviceMonitorT0.cxx
+ * CbmDeviceMonitorBmon.cxx
  *
  * @since 2019-03-26
  * @author F. Uhlig
  */
 
-#include "CbmDeviceMonitorT0.h"
+#include "CbmDeviceMonitorBmon.h"
 
 #include "CbmFlesCanvasTools.h"
-#include "CbmMcbm2018MonitorAlgoT0.h"
+#include "CbmMcbm2018MonitorAlgoBmon.h"
 
 #include "StorableTimeslice.hpp"
 
@@ -43,7 +43,7 @@ struct InitTaskError : std::runtime_error {
 using namespace std;
 
 
-CbmDeviceMonitorT0::CbmDeviceMonitorT0()
+CbmDeviceMonitorBmon::CbmDeviceMonitorBmon()
   : fbIgnoreOverlapMs {false}
   , fsChannelNameDataInput {"t0component"}
   , fsChannelNameHistosInput {"histogram-in"}
@@ -62,14 +62,14 @@ CbmDeviceMonitorT0::CbmDeviceMonitorT0()
   , fulNumMessages {0}
   , fulTsCounter {0}
   , fLastPublishTime {std::chrono::system_clock::now()}
-  , fMonitorAlgo {new CbmMcbm2018MonitorAlgoT0()}
+  , fMonitorAlgo {new CbmMcbm2018MonitorAlgoBmon()}
   , fArrayHisto {}
   , fvpsHistosFolder {}
   , fvpsCanvasConfig {}
 {
 }
 
-void CbmDeviceMonitorT0::InitTask()
+void CbmDeviceMonitorBmon::InitTask()
 try {
   /// Read options from executable
   LOG(info) << "Init options for CbmMqStarHistoServer.";
@@ -125,7 +125,7 @@ try {
     LOG(info) << "Channel name: " << entry.first;
     if (std::string::npos != entry.first.find(fsChannelNameDataInput)) {
       if (!IsChannelNameAllowed(entry.first)) throw InitTaskError("Channel name does not match.");
-      OnData(entry.first, &CbmDeviceMonitorT0::HandleData);
+      OnData(entry.first, &CbmDeviceMonitorBmon::HandleData);
     }  // if( entry.first.find( "ts" )
   }    // for( auto const &entry : fChannels )
 }
@@ -134,7 +134,7 @@ catch (InitTaskError& e) {
   ChangeState(fair::mq::Transition::ErrorFound);
 }
 
-bool CbmDeviceMonitorT0::IsChannelNameAllowed(std::string channelName)
+bool CbmDeviceMonitorBmon::IsChannelNameAllowed(std::string channelName)
 {
   for (auto const& entry : fsAllowedChannels) {
     std::size_t pos1 = channelName.find(entry);
@@ -152,9 +152,9 @@ bool CbmDeviceMonitorT0::IsChannelNameAllowed(std::string channelName)
   return false;
 }
 
-bool CbmDeviceMonitorT0::InitContainers()
+bool CbmDeviceMonitorBmon::InitContainers()
 {
-  LOG(info) << "Init parameter containers for CbmDeviceMonitorT0.";
+  LOG(info) << "Init parameter containers for CbmDeviceMonitorBmon.";
 
   fParCList = fMonitorAlgo->GetParList();
 
@@ -209,7 +209,7 @@ bool CbmDeviceMonitorT0::InitContainers()
   return initOK;
 }
 
-bool CbmDeviceMonitorT0::InitHistograms()
+bool CbmDeviceMonitorBmon::InitHistograms()
 {
   /// Histos creation and obtain pointer on them
   /// Trigger histo creation on all associated algos
@@ -256,7 +256,7 @@ bool CbmDeviceMonitorT0::InitHistograms()
 
 
 // handler is called whenever a message arrives on "data", with a reference to the message and a sub-channel index (here 0)
-bool CbmDeviceMonitorT0::HandleData(FairMQMessagePtr& msg, int /*index*/)
+bool CbmDeviceMonitorBmon::HandleData(FairMQMessagePtr& msg, int /*index*/)
 {
 
   if (0 == fulNumMessages) {
@@ -307,7 +307,7 @@ bool CbmDeviceMonitorT0::HandleData(FairMQMessagePtr& msg, int /*index*/)
   return true;
 }
 
-bool CbmDeviceMonitorT0::SendHistoConfAndData()
+bool CbmDeviceMonitorBmon::SendHistoConfAndData()
 {
   /// Prepare multiparts message and header
   std::pair<uint32_t, uint32_t> pairHeader(fvpsHistosFolder.size(), fvpsCanvasConfig.size());
@@ -345,7 +345,7 @@ bool CbmDeviceMonitorT0::SendHistoConfAndData()
 
   /// Send the multi-parts message to the common histogram messages queue
   if (Send(partsOut, fsChannelNameHistosInput) < 0) {
-    LOG(error) << "CbmDeviceMonitorT0::SendHistoConfAndData => Problem sending data";
+    LOG(error) << "CbmDeviceMonitorBmon::SendHistoConfAndData => Problem sending data";
     return false;
   }  // if( Send( partsOut, fsChannelNameHistosInput ) < 0 )
 
@@ -355,7 +355,7 @@ bool CbmDeviceMonitorT0::SendHistoConfAndData()
   return true;
 }
 
-bool CbmDeviceMonitorT0::SendHistograms()
+bool CbmDeviceMonitorBmon::SendHistograms()
 {
   /// Serialize the array of histos into a single MQ message
   FairMQMessagePtr message(NewMessage());
@@ -375,10 +375,10 @@ bool CbmDeviceMonitorT0::SendHistograms()
 }
 
 
-CbmDeviceMonitorT0::~CbmDeviceMonitorT0() {}
+CbmDeviceMonitorBmon::~CbmDeviceMonitorBmon() {}
 
 
-Bool_t CbmDeviceMonitorT0::DoUnpack(const fles::Timeslice& ts, size_t /*component*/)
+Bool_t CbmDeviceMonitorBmon::DoUnpack(const fles::Timeslice& ts, size_t /*component*/)
 {
   fulTsCounter++;
 
@@ -404,4 +404,4 @@ Bool_t CbmDeviceMonitorT0::DoUnpack(const fles::Timeslice& ts, size_t /*componen
   return kTRUE;
 }
 
-void CbmDeviceMonitorT0::Finish() {}
+void CbmDeviceMonitorBmon::Finish() {}

MQ/monitor/CbmDeviceMonitorT0.h → MQ/monitor/CbmDeviceMonitorBmon.h

@@ -3,14 +3,14 @@
    Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
 /**
- * CbmDeviceMonitorT0.h
+ * CbmDeviceMonitorBmon.h
  *
  * @since 2019-03-26
  * @author F. Uhlig
  */
 
-#ifndef CBMDEVICEMONITORT0_H_
-#define CBMDEVICEMONITORT0_H_
+#ifndef CBMDEVICEMONITORBmon_H_
+#define CBMDEVICEMONITORBmon_H_
 
 #include "CbmMqTMessage.h"
 
@@ -26,12 +26,12 @@
 #include <vector>
 
 class TList;
-class CbmMcbm2018MonitorAlgoT0;
+class CbmMcbm2018MonitorAlgoBmon;
 
-class CbmDeviceMonitorT0 : public FairMQDevice {
+class CbmDeviceMonitorBmon : public FairMQDevice {
 public:
-  CbmDeviceMonitorT0();
-  virtual ~CbmDeviceMonitorT0();
+  CbmDeviceMonitorBmon();
+  virtual ~CbmDeviceMonitorBmon();
 
 protected:
   virtual void InitTask();
@@ -71,7 +71,7 @@ private:
   std::chrono::system_clock::time_point fLastPublishTime;
 
   /// Processing algo
-  CbmMcbm2018MonitorAlgoT0* fMonitorAlgo;
+  CbmMcbm2018MonitorAlgoBmon* fMonitorAlgo;
 
   /// Array of histograms to send to the histogram server
   TObjArray fArrayHisto;
@@ -93,4 +93,4 @@ private:
   bool SendHistograms();
 };
 
-#endif /* CBMDEVICEMONITORT0_H_ */
+#endif /* CBMDEVICEMONITORBmon_H_ */

MQ/monitor/CbmDeviceMonitorPsd.cxx

@@ -7,7 +7,7 @@
  *
  * @since 2021-02-17
  * @author N. Karpushkin
- * @comment based on CbmDeviceMonitorT0 by F. Uhlig
+ * @comment based on CbmDeviceMonitorBmon by F. Uhlig
  */
 
 #include "CbmDeviceMonitorPsd.h"

MQ/monitor/CbmDeviceMonitorPsd.h

@@ -7,7 +7,7 @@
  *
  * @since 2021-02-17
  * @author N. Karpushkin
- * @comment based on CbmDeviceMonitorT0 by F. Uhlig
+ * @comment based on CbmDeviceMonitorBmon by F. Uhlig
  */
 
 #ifndef CBMDEVICEMONITORPSD_H_

MQ/monitor/CbmDeviceMonitorReqT0.cxx → MQ/monitor/CbmDeviceMonitorReqBmon.cxx

@@ -2,10 +2,10 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Pierre-Alain Loizeau [committer] */
 
-#include "CbmDeviceMonitorReqT0.h"
+#include "CbmDeviceMonitorReqBmon.h"
 
 #include "CbmFlesCanvasTools.h"
-#include "CbmMcbm2018MonitorAlgoT0.h"
+#include "CbmMcbm2018MonitorAlgoBmon.h"
 
 #include "StorableTimeslice.hpp"
 
@@ -36,9 +36,9 @@ struct InitTaskError : std::runtime_error {
 using namespace std;
 
 
-CbmDeviceMonitorReqT0::CbmDeviceMonitorReqT0() : fMonitorAlgo {new CbmMcbm2018MonitorAlgoT0()} {}
+CbmDeviceMonitorReqBmon::CbmDeviceMonitorReqBmon() : fMonitorAlgo {new CbmMcbm2018MonitorAlgoBmon()} {}
 
-void CbmDeviceMonitorReqT0::InitTask()
+void CbmDeviceMonitorReqBmon::InitTask()
 try {
   /// Read options from executable
   LOG(info) << "Init options for CbmMqStarHistoServer.";
@@ -87,9 +87,9 @@ catch (InitTaskError& e) {
   ChangeState(fair::mq::Transition::ErrorFound);
 }
 
-bool CbmDeviceMonitorReqT0::InitContainers()
+bool CbmDeviceMonitorReqBmon::InitContainers()
 {
-  LOG(info) << "Init parameter containers for CbmDeviceMonitorReqT0.";
+  LOG(info) << "Init parameter containers for CbmDeviceMonitorReqBmon.";
 
   fParCList = fMonitorAlgo->GetParList();
 
@@ -144,7 +144,7 @@ bool CbmDeviceMonitorReqT0::InitContainers()
   return initOK;
 }
 
-bool CbmDeviceMonitorReqT0::InitHistograms()
+bool CbmDeviceMonitorReqBmon::InitHistograms()
 {
   /// Histos creation and obtain pointer on them
   /// Trigger histo creation on all associated algos
@@ -190,7 +190,7 @@ bool CbmDeviceMonitorReqT0::InitHistograms()
 }
 
 
-bool CbmDeviceMonitorReqT0::ConditionalRun()
+bool CbmDeviceMonitorReqBmon::ConditionalRun()
 {
   /// First request a new TS (full or single system components or multi-syst components block)
   std::string message = fsTsBlockName;
@@ -261,7 +261,7 @@ bool CbmDeviceMonitorReqT0::ConditionalRun()
   return true;
 }
 
-bool CbmDeviceMonitorReqT0::SendHistoConfAndData()
+bool CbmDeviceMonitorReqBmon::SendHistoConfAndData()
 {
   /// Prepare multiparts message and header
   std::pair<uint32_t, uint32_t> pairHeader(fvpsHistosFolder.size(), fvpsCanvasConfig.size());
@@ -297,7 +297,7 @@ bool CbmDeviceMonitorReqT0::SendHistoConfAndData()
 
   /// Send the multi-parts message to the common histogram messages queue
   if (Send(partsOut, fsChannelNameHistosInput) < 0) {
-    LOG(error) << "CbmDeviceMonitorReqT0::SendHistoConfAndData => Problem sending data";
+    LOG(error) << "CbmDeviceMonitorReqBmon::SendHistoConfAndData => Problem sending data";
     return false;
   }  // if( Send( partsOut, fsChannelNameHistosInput ) < 0 )
 
@@ -307,7 +307,7 @@ bool CbmDeviceMonitorReqT0::SendHistoConfAndData()
   return true;
 }
 
-bool CbmDeviceMonitorReqT0::SendHistograms()
+bool CbmDeviceMonitorReqBmon::SendHistograms()
 {
   /// Serialize the array of histos into a single MQ message
   FairMQMessagePtr message(NewMessage());
@@ -327,10 +327,10 @@ bool CbmDeviceMonitorReqT0::SendHistograms()
 }
 
 
-CbmDeviceMonitorReqT0::~CbmDeviceMonitorReqT0() {}
+CbmDeviceMonitorReqBmon::~CbmDeviceMonitorReqBmon() {}
 
 
-Bool_t CbmDeviceMonitorReqT0::DoUnpack(const fles::Timeslice& ts, size_t /*component*/)
+Bool_t CbmDeviceMonitorReqBmon::DoUnpack(const fles::Timeslice& ts, size_t /*component*/)
 {
   fulTsCounter++;
 
@@ -356,4 +356,4 @@ Bool_t CbmDeviceMonitorReqT0::DoUnpack(const fles::Timeslice& ts, size_t /*compo
   return kTRUE;
 }
 
-void CbmDeviceMonitorReqT0::Finish() {}
+void CbmDeviceMonitorReqBmon::Finish() {}

MQ/monitor/CbmDeviceMonitorReqT0.h → MQ/monitor/CbmDeviceMonitorReqBmon.h

@@ -2,8 +2,8 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Pierre-Alain Loizeau [committer] */
 
-#ifndef CBMDEVICEMONITORREQT0_H_
-#define CBMDEVICEMONITORREQT0_H_
+#ifndef CBMDEVICEMONITORREQBmon_H_
+#define CBMDEVICEMONITORREQBmon_H_
 
 #include "CbmMqTMessage.h"
 
@@ -19,12 +19,12 @@
 #include <vector>
 
 class TList;
-class CbmMcbm2018MonitorAlgoT0;
+class CbmMcbm2018MonitorAlgoBmon;
 
-class CbmDeviceMonitorReqT0 : public FairMQDevice {
+class CbmDeviceMonitorReqBmon : public FairMQDevice {
 public:
-  CbmDeviceMonitorReqT0();
-  virtual ~CbmDeviceMonitorReqT0();
+  CbmDeviceMonitorReqBmon();
+  virtual ~CbmDeviceMonitorReqBmon();
 
 protected:
   virtual void InitTask();
@@ -62,7 +62,7 @@ private:
   std::chrono::system_clock::time_point fLastPublishTime = std::chrono::system_clock::now();
 
   /// Processing algo
-  CbmMcbm2018MonitorAlgoT0* fMonitorAlgo;
+  CbmMcbm2018MonitorAlgoBmon* fMonitorAlgo;
 
   /// Array of histograms to send to the histogram server
   TObjArray fArrayHisto = {};
@@ -83,4 +83,4 @@ private:
   bool SendHistograms();
 };
 
-#endif /* CBMDEVICEMONITORREQT0_H_ */
+#endif /* CBMDEVICEMONITORREQBmon_H_ */

MQ/monitor/CbmDeviceMonitorReqTof.cxx

@@ -321,9 +321,9 @@ Bool_t CbmDeviceMonitorReqTof::DoUnpack(const fles::Timeslice& ts, size_t /*comp
       if (kusSysIdTof == ts.descriptor(uCompIdx, 0).sys_id) {
         fMonitorAlgo->AddMsComponentToList(uCompIdx, kusSysIdTof);
       }  // if( kusSysIdTof == ts.descriptor( uCompIdx, 0 ).sys_id )
-      else if (kusSysIdT0 == ts.descriptor(uCompIdx, 0).sys_id) {
-        fMonitorAlgo->AddMsComponentToList(uCompIdx, kusSysIdT0);
-      }  // if( kusSysIdT0 == ts.descriptor( uCompIdx, 0 ).sys_id )
+      else if (kusSysIdBmon == ts.descriptor(uCompIdx, 0).sys_id) {
+        fMonitorAlgo->AddMsComponentToList(uCompIdx, kusSysIdBmon);
+      }  // if( kusSysIdBmon == ts.descriptor( uCompIdx, 0 ).sys_id )
     }    // for( uint32_t uComp = 0; uComp < ts.num_components(); ++uComp )
     fbComponentsAddedToList = kTRUE;
   }  // if( kFALSE == fbComponentsAddedToList )

MQ/monitor/CbmDeviceMonitorReqTof.h

@@ -33,7 +33,7 @@ protected:
 private:
   /// Constants
   static const uint16_t kusSysIdTof = 0x60;
-  static const uint16_t kusSysIdT0  = 0x90;
+  static const uint16_t kusSysIdBmon = 0x90;
 
   /// Control flags
   Bool_t fbIgnoreOverlapMs       = kFALSE;  //! Ignore Overlap Ms: all fuOverlapMsNb MS at the end of timeslice

MQ/monitor/CbmDeviceMonitorTof.cxx

@@ -345,9 +345,9 @@ Bool_t CbmDeviceMonitorTof::DoUnpack(const fles::Timeslice& ts, size_t /*compone
       if (kusSysIdTof == ts.descriptor(uCompIdx, 0).sys_id) {
         fMonitorAlgo->AddMsComponentToList(uCompIdx, kusSysIdTof);
       }  // if( kusSysIdTof == ts.descriptor( uCompIdx, 0 ).sys_id )
-      else if (kusSysIdT0 == ts.descriptor(uCompIdx, 0).sys_id) {
-        fMonitorAlgo->AddMsComponentToList(uCompIdx, kusSysIdT0);
-      }  // if( kusSysIdT0 == ts.descriptor( uCompIdx, 0 ).sys_id )
+      else if (kusSysIdBmon == ts.descriptor(uCompIdx, 0).sys_id) {
+        fMonitorAlgo->AddMsComponentToList(uCompIdx, kusSysIdBmon);
+      }  // if( kusSysIdBmon == ts.descriptor( uCompIdx, 0 ).sys_id )
     }    // for( uint32_t uComp = 0; uComp < ts.num_components(); ++uComp )
     fbComponentsAddedToList = kTRUE;
   }  // if( kFALSE == fbComponentsAddedToList )

MQ/monitor/CbmDeviceMonitorTof.h

@@ -40,7 +40,7 @@ protected:
 private:
   /// Constants
   static const uint16_t kusSysIdTof = 0x60;
-  static const uint16_t kusSysIdT0  = 0x90;
+  static const uint16_t kusSysIdBmon = 0x90;
 
   /// Control flags
   Bool_t fbIgnoreOverlapMs       = kFALSE;  //! Ignore Overlap Ms: all fuOverlapMsNb MS at the end of timeslice

MQ/monitor/runMonitorT0.cxx → MQ/monitor/runMonitorBmon.cxx

@@ -2,7 +2,7 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Pierre-Alain Loizeau, Florian Uhlig [committer] */
 
-#include "CbmDeviceMonitorT0.h"
+#include "CbmDeviceMonitorBmon.h"
 
 #include <iomanip>
 #include <string>
@@ -25,7 +25,7 @@ void addCustomOptions(bpo::options_description& options)
   options.add_options()("SpillCheckInt", bpo::value<double>()->default_value(0.128),
                         "Interval in seconds between count checks for spill detection");
   options.add_options()("ChanMap", bpo::value<std::string>()->default_value("0,1,2,3,4,5,6,7"),
-                        "Set T0 channel map e.g. 0,1,2,3,4,5,6,7");
+                        "Set Bmon channel map e.g. 0,1,2,3,4,5,6,7");
   options.add_options()("PubFreqTs", bpo::value<uint32_t>()->default_value(100), "Histo publishing frequency in TS");
   options.add_options()("PubTimeMin", bpo::value<double_t>()->default_value(1.0),
                         "Minimal time between two publishing");
@@ -37,4 +37,4 @@ void addCustomOptions(bpo::options_description& options)
                         "MQ channel name for histos");
 }
 
-FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/) { return new CbmDeviceMonitorT0(); }
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/) { return new CbmDeviceMonitorBmon(); }

MQ/monitor/runMonitorReqT0.cxx → MQ/monitor/runMonitorReqBmon.cxx

@@ -2,7 +2,7 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Pierre-Alain Loizeau [committer] */
 
-#include "CbmDeviceMonitorReqT0.h"
+#include "CbmDeviceMonitorReqBmon.h"
 
 #include <iomanip>
 #include <string>
@@ -25,7 +25,7 @@ void addCustomOptions(bpo::options_description& options)
   options.add_options()("SpillCheckInt", bpo::value<double>()->default_value(0.128),
                         "Interval in seconds between count checks for spill detection");
   options.add_options()("ChanMap", bpo::value<std::string>()->default_value("0,1,2,3,4,5,6,7"),
-                        "Set T0 channel map e.g. 0,1,2,3,4,5,6,7");
+                        "Set Bmon channel map e.g. 0,1,2,3,4,5,6,7");
   options.add_options()("PubFreqTs", bpo::value<uint32_t>()->default_value(100), "Histo publishing frequency in TS");
   options.add_options()("PubTimeMin", bpo::value<double_t>()->default_value(1.0),
                         "Minimal time between two publishing");
@@ -34,9 +34,9 @@ void addCustomOptions(bpo::options_description& options)
   options.add_options()("TsNameIn", bpo::value<std::string>()->default_value("ts-request"),
                         "MQ channel name for TS data");
   options.add_options()("TsBlockName", bpo::value<std::string>()->default_value(""),
-                        "Block name for requesting TS data, T0 SysId request if empty");
+                        "Block name for requesting TS data, Bmon SysId request if empty");
   options.add_options()("ChNameIn", bpo::value<std::string>()->default_value("histogram-in"),
                         "MQ channel name for histos");
 }
 
-FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/) { return new CbmDeviceMonitorReqT0(); }
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/) { return new CbmDeviceMonitorReqBmon(); }

MQ/parmq/CMakeLists.txt

@@ -20,7 +20,6 @@ set(SRCS ParameterMQServer.cxx runParameterMQServer.cxx
 set(PRIVATE_DEPENDENCIES
   CbmMQBase
   CbmSimSteer
-  FairMQ::Tools
   FairRoot::ParBase
   ROOT::Core
   ROOT::Geom

MQ/sink/CMakeLists.txt

@@ -16,7 +16,6 @@ EndIf()
 
 set(PRIVATE_DEPS
   CbmMQBase
-  FairMQ::Tools
   external::fles_ipc
   )
 

MQ/source/CMakeLists.txt

@@ -26,7 +26,6 @@ set(PRIVATE_DEPS
   CbmFlibFlesTools
   external::fles_logging
   cppzmq
-  FairMQ::Tools
   FairRoot::Base
   FairRoot::ParBase
   )
@@ -92,13 +91,13 @@ set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
   generate_cbm_executable()
 
-set(EXE_NAME MCPointSource)
-set(SRCS CbmMCPointSource.cxx runMCPointSource.cxx)
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
-set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
+#set(EXE_NAME MCPointSource)
+#set(SRCS CbmMCPointSource.cxx runMCPointSource.cxx)
+#set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+#set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
+#set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
-  generate_cbm_executable()
+#  generate_cbm_executable()
 
 set(EXE_NAME TsConsumerReqExample)
 set(SRCS CbmTsConsumerReqDevExample.cxx runTsConsumerReqExample.cxx)

MQ/source/CbmMQTsSamplerRepReq.cxx

@@ -31,16 +31,14 @@
 
 //namespace filesys = boost::filesystem;
 
-#include <thread>  // this_thread::sleep_for
-
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
 #include <ctime>
 #include <iomanip>
 #include <sstream>
 #include <string>
-
-#include <stdio.h>
+#include <thread>  // this_thread::sleep_for
 
 using namespace std;