diff --git a/macro/beamtime/mcbm2019/MonitorHodo.C b/macro/beamtime/mcbm2019/MonitorHodo.C
deleted file mode 100644
index b567bc2c37a68a2ae0fb200e3392505538098a24..0000000000000000000000000000000000000000
--- a/macro/beamtime/mcbm2019/MonitorHodo.C
+++ /dev/null
@@ -1,128 +0,0 @@
-/** @file Cern2017Monitor.C
- ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
- ** @date 26.07.2017
- **
- ** ROOT macro to read tsa files which have been produced with StsXyter + DPB + FLIB
- ** Convert data into cbmroot format.
- ** Uses CbmFlibTestSource as source task.
- */
-
-// In order to call later Finish, we make this global
-FairRunOnline* run = NULL;
-
-void MonitorHodo(TString inFile = "",
- TString sHostname = "localhost",
- Int_t iServerRefreshRate = 100,
- Int_t iServerHttpPort = 8081,
- Int_t nEvents = -1) {
-
- // --- Specify number of events to be produced.
- // --- -1 means run until the end of the input file.
- // Int_t nEvents = -1;
-
- // --- Specify output file name (this is just an example)
- TString outFile = "data/hodo_out.root";
- TString parFile = "data/hodo_param.root";
-
- TString outFile = "data/moni_hodo.root";
-
- // --- Set log output levels
- FairLogger::GetLogger();
- gLogger->SetLogScreenLevel("INFO");
- // gLogger->SetLogScreenLevel("DEBUG");
- gLogger->SetLogVerbosityLevel("LOW");
-
- // --- Define parameter files
- TList* parFileList = new TList();
- TString paramDir = "./";
- /*
- TString paramFileHodo = paramDir + "mStsFwPar.par";
- TObjString* tutDetDigiFileHodo = new TObjString(paramFileHodo);
- parFileList->Add(tutDetDigiFileHodo);
-*/
- // --- Set debug level
- gDebug = 0;
-
- std::cout << std::endl;
- std::cout << ">>> MonitorHodo: output file is " << outFile << std::endl;
-
- // ========================================================================
- // ========================================================================
-
- std::cout << std::endl;
- std::cout << ">>> MonitorHodo: Initialising..." << std::endl;
-
- // Hodoscopes Monitor
- CbmMcbm2018MonitorTaskHodo* monitorHodo = new CbmMcbm2018MonitorTaskHodo();
- monitorHodo->SetIgnoreOverlapMs();
- monitorHodo->SetDpbId(0x5b75);
- monitorHodo->SetHodoElinkIdx(5, 10);
- monitorHodo->SetHodoSwapXY(kFALSE, kTRUE);
- monitorHodo->SetHodoInvertX(kTRUE, kFALSE); // After swap !!!
- monitorHodo->SetHodoInvertY(kFALSE, kTRUE); // After swap !!!
-
- // --- Source task
- CbmMcbm2018Source* source = new CbmMcbm2018Source();
- if ("" != inFile) {
- source->SetFileName(inFile);
- } // if( "" != inFile )
- else {
- source->SetHostName(sHostname);
- } // else of if( "" != inFile )
-
- source->AddUnpacker(monitorHodo, 0x10, ECbmModuleId::kTof); // stsXyter DPBs
-
- source->SetSubscriberHwm(100);
-
- // --- Run
- run = new FairRunOnline(source);
- run->ActivateHttpServer(iServerRefreshRate,
- iServerHttpPort); // refresh each 100 events
- /// To avoid the server sucking all Histos from gROOT when no output file is used
- /// ===> Need to explicitely add the canvases to the server in the task!
- run->GetHttpServer()->SetJSROOT("http://jsroot.gsi.de/5.6.3/");
- run->GetHttpServer()->GetSniffer()->SetScanGlobalDir(kFALSE);
- run->SetAutoFinish(kFALSE);
-
- FairRootFileSink* sink = new FairRootFileSink(outFile);
- run->SetSink(sink);
-
- // ----- Runtime database ---------------------------------------------
- FairRuntimeDb* rtdb = run->GetRuntimeDb();
- FairParAsciiFileIo* parIn = new FairParAsciiFileIo();
- parIn->open(parFileList, "in");
- rtdb->setFirstInput(parIn);
-
- run->Init();
-
- // --- Start run
- TStopwatch timer;
- timer.Start();
- std::cout << ">>> MonitorHodo: Starting run..." << std::endl;
- // run->Run(nEvents, 0); // run until end of input file
- if (nEvents <= 0) {
- run->Run(nEvents, 0); // run until end of input file
- } else {
- run->Run(0, nEvents); // process N Events
- }
- timer.Stop();
-
- std::cout << "Processed " << std::dec << source->GetTsCount() << " timeslices"
- << std::endl;
-
- run->Finish();
-
- // --- End-of-run info
- Double_t rtime = timer.RealTime();
- Double_t ctime = timer.CpuTime();
- std::cout << std::endl << std::endl;
- std::cout << ">>> MonitorHodo: Macro finished successfully." << std::endl;
- std::cout << ">>> MonitorHodo: Output file is " << outFile << std::endl;
- std::cout << ">>> MonitorHodo: Real time " << rtime << " s, CPU time "
- << ctime << " s" << std::endl;
- std::cout << std::endl;
-
- /// --- Screen output for automatic tests
- std::cout << " Test passed" << std::endl;
- std::cout << " All ok " << std::endl;
-}
diff --git a/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C b/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C
index 96f7cba17ad1954840e94465602e7621695e4f58..f8b6f2d182ac89379a70c28c6505172abe6e3e95 100644
--- a/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C
+++ b/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C
@@ -80,29 +80,24 @@ void unpack_pulser_mcbm(UInt_t uRunId = 0,
CbmMcbm2018UnpackerTaskTof* unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
CbmMcbm2018UnpackerTaskRich* unpacker_rich =
new CbmMcbm2018UnpackerTaskRich();
- CbmMcbm2018UnpackerTaskHodo* unpacker_hodo =
- new CbmMcbm2018UnpackerTaskHodo();
CbmMcbm2018UnpackerTaskPsd* unpacker_psd = new CbmMcbm2018UnpackerTaskPsd();
unpacker_sts->SetMonitorMode();
unpacker_much->SetMonitorMode();
unpacker_tof->SetMonitorMode();
unpacker_rich->SetMonitorMode();
- unpacker_hodo->SetMonitorMode();
unpacker_psd->SetMonitorMode();
unpacker_sts->SetIgnoreOverlapMs();
unpacker_much->SetIgnoreOverlapMs();
unpacker_tof->SetIgnoreOverlapMs();
unpacker_rich->SetIgnoreOverlapMs();
- unpacker_hodo->SetIgnoreOverlapMs();
unpacker_psd->SetIgnoreOverlapMs();
unpacker_sts->SetWriteOutputFlag(kFALSE);
unpacker_much->SetWriteOutputFlag(kFALSE);
unpacker_tof->SetWriteOutputFlag(kFALSE);
unpacker_rich->SetWriteOutputFlag(kFALSE);
- unpacker_hodo->SetWriteOutputFlag(kFALSE);
unpacker_psd->SetWriteOutputFlag(kFALSE);
unpacker_sts->SetAdcCut(3);
@@ -245,7 +240,6 @@ void unpack_pulser_mcbm(UInt_t uRunId = 0,
source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof); //gDPB T0 A & B
// source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich );//RICH trb
source->AddUnpacker(unpacker_psd, 0x80, ECbmModuleId::kPsd); //PSD
- // source->AddUnpacker(unpacker_hodo, 0x10, ECbmModuleId::kHodo );//HODO xyter
// --- Run
diff --git a/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C
index 041c6ffbae97b1f628377349bdfb0bf0469c0577..456dd6069a0f0ff2b15c96bbbc6bf8952ee804ec 100644
--- a/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C
@@ -82,22 +82,18 @@ void unpack_tsa_mcbm(TString inFile = "",
CbmMcbm2018UnpackerTaskTof* unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
CbmMcbm2018UnpackerTaskRich* unpacker_rich =
new CbmMcbm2018UnpackerTaskRich();
- CbmMcbm2018UnpackerTaskHodo* unpacker_hodo =
- new CbmMcbm2018UnpackerTaskHodo();
CbmMcbm2018UnpackerTaskPsd* unpacker_psd = new CbmMcbm2018UnpackerTaskPsd();
unpacker_sts->SetMonitorMode();
unpacker_much->SetMonitorMode();
unpacker_tof->SetMonitorMode();
unpacker_rich->SetMonitorMode();
- unpacker_hodo->SetMonitorMode();
unpacker_psd->SetMonitorMode();
unpacker_sts->SetIgnoreOverlapMs();
unpacker_much->SetIgnoreOverlapMs();
unpacker_tof->SetIgnoreOverlapMs();
unpacker_rich->SetIgnoreOverlapMs();
- unpacker_hodo->SetIgnoreOverlapMs();
unpacker_psd->SetIgnoreOverlapMs();
unpacker_tof->SetSeparateArrayT0();
@@ -261,7 +257,6 @@ void unpack_tsa_mcbm(TString inFile = "",
source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof); //gDPB T0 A & B
source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich); //RICH trb
source->AddUnpacker(unpacker_psd, 0x80, ECbmModuleId::kPsd); //PSD
- // source->AddUnpacker(unpacker_hodo, 0x10, kHodo );//HODO xyter
// --- Event header
FairEventHeader* event = new FairEventHeader();
diff --git a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C
index bccde8dc5964e4cfcc79ec47bdd6053210f368ee..635bc828c8d3e7c4b6bcc4eca3dfc19eb4520f51 100644
--- a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C
@@ -78,22 +78,18 @@ void unpack_tsa_mcbm_kronos(UInt_t uRunId = 0,
CbmMcbm2018UnpackerTaskTof* unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
CbmMcbm2018UnpackerTaskRich* unpacker_rich =
new CbmMcbm2018UnpackerTaskRich();
- CbmMcbm2018UnpackerTaskHodo* unpacker_hodo =
- new CbmMcbm2018UnpackerTaskHodo();
CbmMcbm2018UnpackerTaskPsd* unpacker_psd = new CbmMcbm2018UnpackerTaskPsd();
unpacker_sts->SetMonitorMode();
unpacker_much->SetMonitorMode();
unpacker_tof->SetMonitorMode();
unpacker_rich->SetMonitorMode();
- unpacker_hodo->SetMonitorMode();
unpacker_psd->SetMonitorMode();
unpacker_sts->SetIgnoreOverlapMs();
unpacker_much->SetIgnoreOverlapMs();
unpacker_tof->SetIgnoreOverlapMs();
unpacker_rich->SetIgnoreOverlapMs();
- unpacker_hodo->SetIgnoreOverlapMs();
unpacker_psd->SetIgnoreOverlapMs();
// unpacker_sts ->SetAdcCut( 3 );
diff --git a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C
index 0f8d1b349942b42f393e2f917be92e3d16e7194b..fe138820e2d4761936928ead80582d0aea3a4645 100644
--- a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C
+++ b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C
@@ -78,22 +78,18 @@ void unpack_tsa_mcbm_mfles(UInt_t uRunId = 0,
CbmMcbm2018UnpackerTaskTof* unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
CbmMcbm2018UnpackerTaskRich* unpacker_rich =
new CbmMcbm2018UnpackerTaskRich();
- CbmMcbm2018UnpackerTaskHodo* unpacker_hodo =
- new CbmMcbm2018UnpackerTaskHodo();
CbmMcbm2018UnpackerTaskPsd* unpacker_psd = new CbmMcbm2018UnpackerTaskPsd();
unpacker_sts->SetMonitorMode();
unpacker_much->SetMonitorMode();
unpacker_tof->SetMonitorMode();
unpacker_rich->SetMonitorMode();
- unpacker_hodo->SetMonitorMode();
unpacker_psd->SetMonitorMode();
unpacker_sts->SetIgnoreOverlapMs();
unpacker_much->SetIgnoreOverlapMs();
unpacker_tof->SetIgnoreOverlapMs();
unpacker_rich->SetIgnoreOverlapMs();
- unpacker_hodo->SetIgnoreOverlapMs();
unpacker_psd->SetIgnoreOverlapMs();
unpacker_sts->SetAdcCut(3);
@@ -1611,7 +1607,6 @@ void unpack_tsa_mcbm_mfles(UInt_t uRunId = 0,
if (358 != uRunId && 361 != uRunId && 367 != uRunId && 369 != uRunId)
source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich); //RICH trb
source->AddUnpacker(unpacker_psd, 0x80, ECbmModuleId::kPsd); //PSD
- // source->AddUnpacker(unpacker_hodo, 0x10, ECbmModuleId::kHodo );//HODO xyter
// --- Event header
FairEventHeader* event = new FairEventHeader();
diff --git a/macro/beamtime/pulser2020/unpack_pulser_mcbm.C b/macro/beamtime/pulser2020/unpack_pulser_mcbm.C
index 9b037243331c42cec958e10004f881086e2c6868..2ea071253570131ec3296522506a777a43fcf444 100644
--- a/macro/beamtime/pulser2020/unpack_pulser_mcbm.C
+++ b/macro/beamtime/pulser2020/unpack_pulser_mcbm.C
@@ -55,11 +55,7 @@ void unpack_pulser_mcbm(UInt_t uRunId = 0,
TString paramFileRich = paramDir + "mRichPar.par";
TObjString* parRichFileName = new TObjString(paramFileRich);
parFileList->Add(parRichFileName);
- /*
- TString paramFileHodo = paramDir + "mHodoPar.par";
- TObjString* parHodoFileName = new TObjString(paramFileHodo);
- parFileList->Add(parHodoFileName);
-*/
+
TString paramFilePsd = paramDir + "mPsdPar.par";
TObjString* parPsdFileName = new TObjString(paramFilePsd);
parFileList->Add(parPsdFileName);
@@ -81,29 +77,24 @@ void unpack_pulser_mcbm(UInt_t uRunId = 0,
CbmMcbm2018UnpackerTaskTof* unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
CbmMcbm2018UnpackerTaskRich* unpacker_rich =
new CbmMcbm2018UnpackerTaskRich();
- CbmMcbm2018UnpackerTaskHodo* unpacker_hodo =
- new CbmMcbm2018UnpackerTaskHodo();
CbmMcbm2018UnpackerTaskPsd* unpacker_psd = new CbmMcbm2018UnpackerTaskPsd();
unpacker_sts->SetMonitorMode();
unpacker_much->SetMonitorMode();
unpacker_tof->SetMonitorMode();
unpacker_rich->SetMonitorMode();
- unpacker_hodo->SetMonitorMode();
unpacker_psd->SetMonitorMode();
unpacker_sts->SetIgnoreOverlapMs();
unpacker_much->SetIgnoreOverlapMs();
unpacker_tof->SetIgnoreOverlapMs();
unpacker_rich->SetIgnoreOverlapMs();
- unpacker_hodo->SetIgnoreOverlapMs();
unpacker_psd->SetIgnoreOverlapMs();
unpacker_sts->SetWriteOutputFlag(kFALSE);
unpacker_much->SetWriteOutputFlag(kFALSE);
unpacker_tof->SetWriteOutputFlag(kFALSE);
unpacker_rich->SetWriteOutputFlag(kFALSE);
- unpacker_hodo->SetWriteOutputFlag(kFALSE);
unpacker_psd->SetWriteOutputFlag(kFALSE);
// unpacker_sts ->SetAdcCut( 3 );
@@ -250,7 +241,6 @@ void unpack_pulser_mcbm(UInt_t uRunId = 0,
source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof); //gDPB T0 A & B
source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich); //RICH trb
source->AddUnpacker(unpacker_psd, 0x80, ECbmModuleId::kPsd); //PSD
- // source->AddUnpacker(unpacker_hodo, 0x10, ECbmModuleId::kHodo );//HODO xyter
// --- Run
run = new FairRunOnline(source);