diff --git a/fles/cosy2019/CMakeLists.txt b/fles/cosy2019/CMakeLists.txt
index 1d9ec7265c3a6f03dbe13712cac557f73df5080d..6f7cecbedaed3902639088dc96b8b045093d897d 100644
--- a/fles/cosy2019/CMakeLists.txt
+++ b/fles/cosy2019/CMakeLists.txt
@@ -47,14 +47,14 @@ Link_Directories(
Set(SRCS
- parameter/CbmMcbm2018HodoPar.cxx
- parameter/CbmMcbm2018ContFact.cxx
+ parameter/CbmCosy2019HodoPar.cxx
+ parameter/CbmCosy2019ContFact.cxx
- unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
- unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
+ unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
+ unpacker/CbmCosy2019UnpackerTaskHodo.cxx
- monitor/CbmMcbm2018MonitorAlgoHodo.cxx
- monitor/CbmMcbm2018MonitorTaskHodo.cxx
+ monitor/CbmCosy2019MonitorAlgoHodo.cxx
+ monitor/CbmCosy2019MonitorTaskHodo.cxx
)
If(_UINT8_T_EXIST)
diff --git a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
index 5837fd4c6a2cbefb65b7658ea8aeabaea2612694..affce1ea6aa2f597a0149068a19afaf106681891 100644
--- a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
+++ b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
@@ -4,13 +4,13 @@
#pragma link off all classes;
#pragma link off all functions;
-#pragma link C++ class CbmMcbm2018HodoPar;
-#pragma link C++ class CbmMcbm2018ContFact;
+#pragma link C++ class CbmCosy2019HodoPar;
+#pragma link C++ class CbmCosy2019ContFact;
-#pragma link C++ class CbmMcbm2018UnpackerAlgoHodo;
-#pragma link C++ class CbmMcbm2018UnpackerTaskHodo + ;
+#pragma link C++ class CbmCosy2019UnpackerAlgoHodo;
+#pragma link C++ class CbmCosy2019UnpackerTaskHodo + ;
-#pragma link C++ class CbmMcbm2018MonitorAlgoHodo;
-#pragma link C++ class CbmMcbm2018MonitorTaskHodo;
+#pragma link C++ class CbmCosy2019MonitorAlgoHodo;
+#pragma link C++ class CbmCosy2019MonitorTaskHodo;
#endif
diff --git a/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
similarity index 97%
rename from fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.cxx
rename to fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
index 1416ca30b42398e46005bee65f8c3e8edb803e22..c43e1bc57d5df1feb00ce1dd0eaff833bb2b1611 100644
--- a/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
@@ -1,15 +1,15 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018MonitorAlgoHodo -----
+// ----- CbmCosy2019MonitorAlgoHodo -----
// ----- Created 03.07.2019 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#include "CbmMcbm2018MonitorAlgoHodo.h"
+#include "CbmCosy2019MonitorAlgoHodo.h"
#include "CbmFormatMsHeaderPrintout.h"
-//#include "CbmMcbm2018HodoPar.h"
+//#include "CbmCosy2019HodoPar.h"
#include "FairLogger.h"
#include "FairRootManager.h"
@@ -31,7 +31,7 @@
#include <stdint.h>
// -------------------------------------------------------------------------
-CbmMcbm2018MonitorAlgoHodo::CbmMcbm2018MonitorAlgoHodo()
+CbmCosy2019MonitorAlgoHodo::CbmCosy2019MonitorAlgoHodo()
: CbmStar2019Algo()
,
/// From the class itself
@@ -138,36 +138,36 @@ CbmMcbm2018MonitorAlgoHodo::CbmMcbm2018MonitorAlgoHodo()
, fcHodoFullCoinc(nullptr)
, fcHodoFullCoincPos(nullptr)
, fcHodoPrevHitDt(nullptr) {}
-CbmMcbm2018MonitorAlgoHodo::~CbmMcbm2018MonitorAlgoHodo() {
+CbmCosy2019MonitorAlgoHodo::~CbmCosy2019MonitorAlgoHodo() {
/// Clear buffers
fvmHitsInMs.clear();
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018MonitorAlgoHodo::Init() {
+Bool_t CbmCosy2019MonitorAlgoHodo::Init() {
LOG(info) << "Initializing mCBM HODO 2019 monitor algo";
return kTRUE;
}
-void CbmMcbm2018MonitorAlgoHodo::Reset() {}
-void CbmMcbm2018MonitorAlgoHodo::Finish() {
+void CbmCosy2019MonitorAlgoHodo::Reset() {}
+void CbmCosy2019MonitorAlgoHodo::Finish() {
/// Printout Goodbye message and stats
/// Write Output histos
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018MonitorAlgoHodo::InitContainers() {
- LOG(info) << "Init parameter containers for CbmMcbm2018MonitorAlgoHodo";
+Bool_t CbmCosy2019MonitorAlgoHodo::InitContainers() {
+ LOG(info) << "Init parameter containers for CbmCosy2019MonitorAlgoHodo";
Bool_t initOK = ReInitContainers();
return initOK;
}
-Bool_t CbmMcbm2018MonitorAlgoHodo::ReInitContainers() {
+Bool_t CbmCosy2019MonitorAlgoHodo::ReInitContainers() {
LOG(info) << "**********************************************";
- LOG(info) << "ReInit parameter containers for CbmMcbm2018MonitorAlgoHodo";
+ LOG(info) << "ReInit parameter containers for CbmCosy2019MonitorAlgoHodo";
/*
- fUnpackPar = (CbmMcbm2018HodoPar*)fParCList->FindObject("CbmMcbm2018HodoPar");
+ fUnpackPar = (CbmCosy2019HodoPar*)fParCList->FindObject("CbmCosy2019HodoPar");
if( nullptr == fUnpackPar )
return kFALSE;
*/
@@ -175,15 +175,15 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::ReInitContainers() {
return initOK;
}
-TList* CbmMcbm2018MonitorAlgoHodo::GetParList() {
+TList* CbmCosy2019MonitorAlgoHodo::GetParList() {
if (nullptr == fParCList) fParCList = new TList();
/*
- fUnpackPar = new CbmMcbm2018HodoPar("CbmMcbm2018HodoPar");
+ fUnpackPar = new CbmCosy2019HodoPar("CbmCosy2019HodoPar");
fParCList->Add(fUnpackPar);
*/
return fParCList;
}
-Bool_t CbmMcbm2018MonitorAlgoHodo::InitParameters() {
+Bool_t CbmCosy2019MonitorAlgoHodo::InitParameters() {
/*
fuNbModules = fUnpackPar->GetNbOfModules();
LOG(info) << "Nr. of STS Modules: " << fuNbModules;
@@ -369,7 +369,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::InitParameters() {
}
// -------------------------------------------------------------------------
-void CbmMcbm2018MonitorAlgoHodo::AddMsComponentToList(size_t component,
+void CbmCosy2019MonitorAlgoHodo::AddMsComponentToList(size_t component,
UShort_t usDetectorId) {
/// Check for duplicates and ignore if it is the case
for (UInt_t uCompIdx = 0; uCompIdx < fvMsComponentsList.size(); ++uCompIdx)
@@ -378,13 +378,13 @@ void CbmMcbm2018MonitorAlgoHodo::AddMsComponentToList(size_t component,
/// Add to list
fvMsComponentsList.push_back(component);
- LOG(info) << "CbmMcbm2018MonitorAlgoHodo::AddMsComponentToList => Component "
+ LOG(info) << "CbmCosy2019MonitorAlgoHodo::AddMsComponentToList => Component "
<< component << " with detector ID 0x" << std::hex << usDetectorId
<< std::dec << " added to list";
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessTs(const fles::Timeslice& ts) {
+Bool_t CbmCosy2019MonitorAlgoHodo::ProcessTs(const fles::Timeslice& ts) {
fulCurrentTsIdx = ts.index();
fdTsStartTime = static_cast<Double_t>(ts.descriptor(0, 0).idx);
@@ -459,7 +459,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessTs(const fles::Timeslice& ts) {
return kTRUE;
}
-Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessMs(const fles::Timeslice& ts,
+Bool_t CbmCosy2019MonitorAlgoHodo::ProcessMs(const fles::Timeslice& ts,
size_t uMsCompIdx,
size_t uMsIdx) {
auto msDescriptor = ts.descriptor(uMsCompIdx, uMsIdx);
@@ -605,7 +605,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessMs(const fles::Timeslice& ts,
} // if( fuElinkIdxHodo[ uHodo ] == usElinkIdx )
if (bBadElink) {
- LOG(warning) << "CbmMcbm2018MonitorAlgoHodo::DoUnpack => "
+ LOG(warning) << "CbmCosy2019MonitorAlgoHodo::DoUnpack => "
<< "Wrong elink Idx! Elink raw "
<< Form("%2d", usElinkIdx);
continue;
@@ -627,7 +627,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessMs(const fles::Timeslice& ts,
ProcessEpochInfo(mess);
if (0 < uIdx)
- LOG(info) << "CbmMcbm2018MonitorAlgoHodo::DoUnpack => "
+ LOG(info) << "CbmCosy2019MonitorAlgoHodo::DoUnpack => "
<< "EPOCH message at unexpected position in MS: message "
<< uIdx << " VS message 0 expected!";
break;
@@ -649,7 +649,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessMs(const fles::Timeslice& ts,
break;
} // case stsxyter::MessType::Dummy / ReadDataAck / Ack :
default: {
- LOG(fatal) << "CbmMcbm2018MonitorAlgoHodo::DoUnpack => "
+ LOG(fatal) << "CbmCosy2019MonitorAlgoHodo::DoUnpack => "
<< "Unknown message type, should never happen, stopping "
"here! Type found was: "
<< static_cast<int>(typeMess);
@@ -661,7 +661,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::ProcessMs(const fles::Timeslice& ts,
}
// -------------------------------------------------------------------------
-void CbmMcbm2018MonitorAlgoHodo::ProcessHitInfo(stsxyter::Message mess,
+void CbmCosy2019MonitorAlgoHodo::ProcessHitInfo(stsxyter::Message mess,
const UInt_t& uHodoIdx,
const UInt_t& /*uMsIdx*/) {
UShort_t usChan = mess.GetHitChannel();
@@ -726,7 +726,7 @@ void CbmMcbm2018MonitorAlgoHodo::ProcessHitInfo(stsxyter::Message mess,
} // if( mess.IsHitMissedEvts() )
}
-void CbmMcbm2018MonitorAlgoHodo::ProcessTsMsbInfo(stsxyter::Message mess,
+void CbmCosy2019MonitorAlgoHodo::ProcessTsMsbInfo(stsxyter::Message mess,
UInt_t uMessIdx,
UInt_t uMsIdx) {
UInt_t uVal = mess.GetTsMsbVal();
@@ -762,7 +762,7 @@ void CbmMcbm2018MonitorAlgoHodo::ProcessTsMsbInfo(stsxyter::Message mess,
*/
}
-void CbmMcbm2018MonitorAlgoHodo::ProcessEpochInfo(stsxyter::Message /*mess*/) {
+void CbmCosy2019MonitorAlgoHodo::ProcessEpochInfo(stsxyter::Message /*mess*/) {
// UInt_t uVal = mess.GetEpochVal();
// UInt_t uCurrentCycle = uVal % stsxyter::kulTsCycleNbBins;
@@ -774,7 +774,7 @@ void CbmMcbm2018MonitorAlgoHodo::ProcessEpochInfo(stsxyter::Message /*mess*/) {
*/
}
-void CbmMcbm2018MonitorAlgoHodo::ProcessStatusInfo(stsxyter::Message /*mess*/) {
+void CbmCosy2019MonitorAlgoHodo::ProcessStatusInfo(stsxyter::Message /*mess*/) {
/*
UInt_t uCrobIdx = usElinkIdx / XXXX
Int_t uFebIdx = XXXX
@@ -796,7 +796,7 @@ void CbmMcbm2018MonitorAlgoHodo::ProcessStatusInfo(stsxyter::Message /*mess*/) {
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018MonitorAlgoHodo::CreateHistograms() {
+Bool_t CbmCosy2019MonitorAlgoHodo::CreateHistograms() {
fhHodoMessType =
new TH1I("hHodoMessType", "Nb of message for each type; Type", 6, 0., 6.);
fhHodoMessType->GetXaxis()->SetBinLabel(1, "Dummy");
@@ -1668,7 +1668,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::CreateHistograms() {
return kTRUE;
}
-Bool_t CbmMcbm2018MonitorAlgoHodo::FillHistograms() {
+Bool_t CbmCosy2019MonitorAlgoHodo::FillHistograms() {
/// Prepare storage variables
std::vector<std::vector<stsxyter::FinalHit>> lastHitHodoAxis;
std::vector<std::vector<Bool_t>> bHitFoundHodoAxis;
@@ -1853,7 +1853,7 @@ Bool_t CbmMcbm2018MonitorAlgoHodo::FillHistograms() {
return kTRUE;
}
-Bool_t CbmMcbm2018MonitorAlgoHodo::ResetHistograms() {
+Bool_t CbmCosy2019MonitorAlgoHodo::ResetHistograms() {
fhHodoMessType->Reset();
fhHodoStatusMessType->Reset();
fhHodoMsStatusFieldType->Reset();
diff --git a/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.h b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
similarity index 96%
rename from fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.h
rename to fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
index 6ab578eda3413932bd6b1c7dd4e23c01b4e3298f..26d10fde24a812dad39001183b862d746e71d67a 100644
--- a/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.h
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
@@ -1,12 +1,12 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018MonitorAlgoHodo -----
+// ----- CbmCosy2019MonitorAlgoHodo -----
// ----- Created 03.07.2019 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#ifndef CbmMcbm2018MonitorAlgoHodo_H
-#define CbmMcbm2018MonitorAlgoHodo_H
+#ifndef CbmCosy2019MonitorAlgoHodo_H
+#define CbmCosy2019MonitorAlgoHodo_H
#include "CbmStar2019Algo.h"
@@ -31,10 +31,10 @@
class TProfile;
-class CbmMcbm2018MonitorAlgoHodo : public CbmStar2019Algo<CbmStsDigi> {
+class CbmCosy2019MonitorAlgoHodo : public CbmStar2019Algo<CbmStsDigi> {
public:
- CbmMcbm2018MonitorAlgoHodo();
- ~CbmMcbm2018MonitorAlgoHodo();
+ CbmCosy2019MonitorAlgoHodo();
+ ~CbmCosy2019MonitorAlgoHodo();
virtual Bool_t Init();
virtual void Reset();
@@ -96,7 +96,7 @@ private:
/// Settings from parameter file => For now use only accessors!
/*
- CbmMcbm2018HodoPar* fUnpackPar; //!
+ CbmCosy2019HodoPar* fUnpackPar; //!
/// Readout chain dimensions and mapping
UInt_t fuNbModules; //! Total number of STS modules in the setup
std::vector< Int_t > fviModuleType; //! Type of each module: 0 for connectors on the right, 1 for connectors on the left
@@ -294,10 +294,10 @@ private:
void ProcessEpochInfo(stsxyter::Message mess);
void ProcessStatusInfo(stsxyter::Message mess);
- CbmMcbm2018MonitorAlgoHodo(const CbmMcbm2018MonitorAlgoHodo&);
- CbmMcbm2018MonitorAlgoHodo operator=(const CbmMcbm2018MonitorAlgoHodo&);
+ CbmCosy2019MonitorAlgoHodo(const CbmCosy2019MonitorAlgoHodo&);
+ CbmCosy2019MonitorAlgoHodo operator=(const CbmCosy2019MonitorAlgoHodo&);
- ClassDef(CbmMcbm2018MonitorAlgoHodo, 1)
+ ClassDef(CbmCosy2019MonitorAlgoHodo, 1)
};
#endif
diff --git a/fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
similarity index 81%
rename from fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.cxx
rename to fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
index 91528178a0058162ba34dc9d7d1456b8f92309ce..df855220d4044f188a548ffe93379863ea2d5d35 100644
--- a/fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
@@ -1,14 +1,14 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018MonitorTaskHodo -----
+// ----- CbmCosy2019MonitorTaskHodo -----
// ----- Created 03.07.2019 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#include "CbmMcbm2018MonitorTaskHodo.h"
+#include "CbmCosy2019MonitorTaskHodo.h"
-#include "CbmMcbm2018MonitorAlgoHodo.h"
-//#include "CbmMcbm2018HodoPar.h"
+#include "CbmCosy2019MonitorAlgoHodo.h"
+//#include "CbmCosy2019HodoPar.h"
//#include "CbmHodoDigi.h"
#include "FairLogger.h"
@@ -31,9 +31,9 @@
#include <iostream>
#include <stdint.h>
-Bool_t bMcbm2018MonitorTaskHodoResetHistos = kFALSE;
+Bool_t bCosy2019MonitorTaskHodoResetHistos = kFALSE;
-CbmMcbm2018MonitorTaskHodo::CbmMcbm2018MonitorTaskHodo(UInt_t /*uNbGdpb*/)
+CbmCosy2019MonitorTaskHodo::CbmCosy2019MonitorTaskHodo(UInt_t /*uNbGdpb*/)
: CbmMcbmUnpack()
, fbMonitorMode(kFALSE)
, fbWriteOutput(kTRUE)
@@ -41,15 +41,15 @@ CbmMcbm2018MonitorTaskHodo::CbmMcbm2018MonitorTaskHodo(UInt_t /*uNbGdpb*/)
,
// fHodoDigiCloneArray(),
fMonitorAlgo(nullptr) {
- fMonitorAlgo = new CbmMcbm2018MonitorAlgoHodo();
+ fMonitorAlgo = new CbmCosy2019MonitorAlgoHodo();
}
-CbmMcbm2018MonitorTaskHodo::~CbmMcbm2018MonitorTaskHodo() {
+CbmCosy2019MonitorTaskHodo::~CbmCosy2019MonitorTaskHodo() {
delete fMonitorAlgo;
}
-Bool_t CbmMcbm2018MonitorTaskHodo::Init() {
- LOG(info) << "CbmMcbm2018MonitorTaskHodo::Init";
+Bool_t CbmCosy2019MonitorTaskHodo::Init() {
+ LOG(info) << "CbmCosy2019MonitorTaskHodo::Init";
LOG(info) << "Initializing mCBM Hodoscopes Monitor";
/*
FairRootManager* ioman = FairRootManager::Instance();
@@ -68,7 +68,7 @@ Bool_t CbmMcbm2018MonitorTaskHodo::Init() {
return kTRUE;
}
-void CbmMcbm2018MonitorTaskHodo::SetParContainers() {
+void CbmCosy2019MonitorTaskHodo::SetParContainers() {
LOG(info) << "Setting parameter containers for " << GetName();
TList* parCList = fMonitorAlgo->GetParList();
@@ -92,15 +92,15 @@ void CbmMcbm2018MonitorTaskHodo::SetParContainers() {
} // for( Int_t iparC = 0; iparC < parCList->GetEntries(); ++iparC )
}
-Bool_t CbmMcbm2018MonitorTaskHodo::InitContainers() {
+Bool_t CbmCosy2019MonitorTaskHodo::InitContainers() {
LOG(info) << "Init parameter containers for " << GetName();
/// Control flags
/*
- CbmMcbm2018HodoPar * pUnpackPar = dynamic_cast<CbmMcbm2018HodoPar*>( FairRun::Instance()->GetRuntimeDb()->getContainer( "CbmMcbm2018HodoPar" ) );
+ CbmCosy2019HodoPar * pUnpackPar = dynamic_cast<CbmCosy2019HodoPar*>( FairRun::Instance()->GetRuntimeDb()->getContainer( "CbmCosy2019HodoPar" ) );
if( nullptr == pUnpackPar )
{
- LOG(error) << "Failed to obtain parameter container CbmMcbm2018HodoPar";
+ LOG(error) << "Failed to obtain parameter container CbmCosy2019HodoPar";
return kFALSE;
} // if( nullptr == pUnpackPar )
*/
@@ -141,7 +141,7 @@ Bool_t CbmMcbm2018MonitorTaskHodo::InitContainers() {
} // for( UInt_t uHisto = 0; uHisto < vHistos.size(); ++uHisto )
server->RegisterCommand("/Reset_MoniHodo_Hist",
- "bMcbm2018MonitorTaskHodoResetHistos=kTRUE");
+ "bCosy2019MonitorTaskHodoResetHistos=kTRUE");
server->Restrict("/Reset_MoniHodo_Hist", "allow=admin");
} // if( nullptr != server )
@@ -150,25 +150,25 @@ Bool_t CbmMcbm2018MonitorTaskHodo::InitContainers() {
return initOK;
}
-Bool_t CbmMcbm2018MonitorTaskHodo::ReInitContainers() {
+Bool_t CbmCosy2019MonitorTaskHodo::ReInitContainers() {
LOG(info) << "ReInit parameter containers for " << GetName();
Bool_t initOK = fMonitorAlgo->ReInitContainers();
return initOK;
}
-void CbmMcbm2018MonitorTaskHodo::AddMsComponentToList(size_t component,
+void CbmCosy2019MonitorTaskHodo::AddMsComponentToList(size_t component,
UShort_t usDetectorId) {
fMonitorAlgo->AddMsComponentToList(component, usDetectorId);
}
-Bool_t CbmMcbm2018MonitorTaskHodo::DoUnpack(const fles::Timeslice& ts,
+Bool_t CbmCosy2019MonitorTaskHodo::DoUnpack(const fles::Timeslice& ts,
size_t /*component*/) {
- if (fbMonitorMode && bMcbm2018MonitorTaskHodoResetHistos) {
+ if (fbMonitorMode && bCosy2019MonitorTaskHodoResetHistos) {
LOG(info) << "Reset Hodoscopes monitor histos ";
fMonitorAlgo->ResetHistograms();
- bMcbm2018MonitorTaskHodoResetHistos = kFALSE;
- } // if( fbMonitorMode && bMcbm2018MonitorTaskHodoResetHistos )
+ bCosy2019MonitorTaskHodoResetHistos = kFALSE;
+ } // if( fbMonitorMode && bCosy2019MonitorTaskHodoResetHistos )
if (kFALSE == fMonitorAlgo->ProcessTs(ts)) {
LOG(error) << "Failed processing TS " << ts.index()
@@ -201,18 +201,18 @@ Bool_t CbmMcbm2018MonitorTaskHodo::DoUnpack(const fles::Timeslice& ts,
return kTRUE;
}
-void CbmMcbm2018MonitorTaskHodo::Reset() {
+void CbmCosy2019MonitorTaskHodo::Reset() {
// fHodoDigiCloneArray->Clear();
}
-void CbmMcbm2018MonitorTaskHodo::Finish() {
+void CbmCosy2019MonitorTaskHodo::Finish() {
/// If monitor mode enabled, trigger histos creation, obtain pointer on them and add them to the HTTP server
if (kTRUE == fbMonitorMode) {
SaveHistograms();
} // if( kTRUE == fbMonitorMode )
}
-Bool_t CbmMcbm2018MonitorTaskHodo::SaveHistograms() {
+Bool_t CbmCosy2019MonitorTaskHodo::SaveHistograms() {
/// Obtain vector of pointers on each histo from the algo (+ optionally desired folder)
std::vector<std::pair<TNamed*, std::string>> vHistos =
fMonitorAlgo->GetHistoVector();
@@ -266,32 +266,32 @@ Bool_t CbmMcbm2018MonitorTaskHodo::SaveHistograms() {
return kTRUE;
}
-void CbmMcbm2018MonitorTaskHodo::SetIgnoreOverlapMs(Bool_t bFlagIn) {
+void CbmCosy2019MonitorTaskHodo::SetIgnoreOverlapMs(Bool_t bFlagIn) {
fMonitorAlgo->SetIgnoreOverlapMs(bFlagIn);
}
-void CbmMcbm2018MonitorTaskHodo::SetTimeOffsetNs(Double_t dOffsetIn) {
+void CbmCosy2019MonitorTaskHodo::SetTimeOffsetNs(Double_t dOffsetIn) {
fMonitorAlgo->SetTimeOffsetNs(dOffsetIn);
}
-void CbmMcbm2018MonitorTaskHodo::SetDpbId(UInt_t uDpbId) {
+void CbmCosy2019MonitorTaskHodo::SetDpbId(UInt_t uDpbId) {
fMonitorAlgo->SetDpbId(uDpbId);
}
-void CbmMcbm2018MonitorTaskHodo::SetHodoElinkIdx(UInt_t uElinkHodoA,
+void CbmCosy2019MonitorTaskHodo::SetHodoElinkIdx(UInt_t uElinkHodoA,
UInt_t uElinkHodoB) {
fMonitorAlgo->SetHodoElinkIdx(uElinkHodoA, uElinkHodoB);
}
-void CbmMcbm2018MonitorTaskHodo::SetHodoSwapXY(Bool_t bSwapHodoA,
+void CbmCosy2019MonitorTaskHodo::SetHodoSwapXY(Bool_t bSwapHodoA,
Bool_t bSwapHodoB) {
fMonitorAlgo->SetHodoSwapXY(bSwapHodoA, bSwapHodoB);
}
-void CbmMcbm2018MonitorTaskHodo::SetHodoInvertX(Bool_t bInvHodoA,
+void CbmCosy2019MonitorTaskHodo::SetHodoInvertX(Bool_t bInvHodoA,
Bool_t bInvHodoB) {
fMonitorAlgo->SetHodoInvertX(bInvHodoA, bInvHodoB);
}
-void CbmMcbm2018MonitorTaskHodo::SetHodoInvertY(Bool_t bInvHodoA,
+void CbmCosy2019MonitorTaskHodo::SetHodoInvertY(Bool_t bInvHodoA,
Bool_t bInvHodoB) {
fMonitorAlgo->SetHodoInvertY(bInvHodoA, bInvHodoB);
}
-ClassImp(CbmMcbm2018MonitorTaskHodo)
+ClassImp(CbmCosy2019MonitorTaskHodo)
diff --git a/fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.h b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
similarity index 78%
rename from fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.h
rename to fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
index 39a9580c8aa6d915543cd567171d2fc0d52da5f8..02c4ca1e48840437fdcf94c83f3a4c045422dca8 100644
--- a/fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.h
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
@@ -1,28 +1,28 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018MonitorTaskHodo -----
+// ----- CbmCosy2019MonitorTaskHodo -----
// ----- Created 03.07.2019 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#ifndef CbmMcbm2018MonitorTaskHodo_H
-#define CbmMcbm2018MonitorTaskHodo_H
+#ifndef CbmCosy2019MonitorTaskHodo_H
+#define CbmCosy2019MonitorTaskHodo_H
#include "Timeslice.hpp"
#include "CbmMcbmUnpack.h"
-class CbmMcbm2018MonitorAlgoHodo;
+class CbmCosy2019MonitorAlgoHodo;
-class CbmMcbm2018MonitorTaskHodo : public CbmMcbmUnpack {
+class CbmCosy2019MonitorTaskHodo : public CbmMcbmUnpack {
public:
- CbmMcbm2018MonitorTaskHodo(UInt_t uNbSdpb = 1);
+ CbmCosy2019MonitorTaskHodo(UInt_t uNbSdpb = 1);
- CbmMcbm2018MonitorTaskHodo(const CbmMcbm2018MonitorTaskHodo&) = delete;
- CbmMcbm2018MonitorTaskHodo
- operator=(const CbmMcbm2018MonitorTaskHodo&) = delete;
+ CbmCosy2019MonitorTaskHodo(const CbmCosy2019MonitorTaskHodo&) = delete;
+ CbmCosy2019MonitorTaskHodo
+ operator=(const CbmCosy2019MonitorTaskHodo&) = delete;
- virtual ~CbmMcbm2018MonitorTaskHodo();
+ virtual ~CbmCosy2019MonitorTaskHodo();
virtual Bool_t Init();
virtual Bool_t DoUnpack(const fles::Timeslice& ts, size_t component);
@@ -68,11 +68,11 @@ private:
uint64_t fulTsCounter;
/// Processing algo
- CbmMcbm2018MonitorAlgoHodo* fMonitorAlgo;
+ CbmCosy2019MonitorAlgoHodo* fMonitorAlgo;
Bool_t SaveHistograms();
- ClassDef(CbmMcbm2018MonitorTaskHodo, 1)
+ ClassDef(CbmCosy2019MonitorTaskHodo, 1)
};
#endif
diff --git a/fles/cosy2019/parameter/CbmMcbm2018ContFact.cxx b/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
similarity index 66%
rename from fles/cosy2019/parameter/CbmMcbm2018ContFact.cxx
rename to fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
index 88964fb14a1ac671d127076142df2f88e02cba7d..4c8376386655e19403f370f20cb6333c8de85857 100644
--- a/fles/cosy2019/parameter/CbmMcbm2018ContFact.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
@@ -1,51 +1,50 @@
/////////////////////////////////////////////////////////////
//
-// CbmMcbm2018ContFact
+// CbmCosy2019ContFact
//
-// Factory for the parameter containers in libMcbm2018
+// Factory for the parameter containers in libCosy2019
//
/////////////////////////////////////////////////////////////
-#include "CbmMcbm2018ContFact.h"
+#include "CbmCosy2019ContFact.h"
-#include "CbmMcbm2018HodoPar.h"
+#include "CbmCosy2019HodoPar.h"
#include "FairRuntimeDb.h"
-ClassImp(CbmMcbm2018ContFact)
+ClassImp(CbmCosy2019ContFact)
- static CbmMcbm2018ContFact gCbmMcbm2018ContFact;
+ static CbmCosy2019ContFact gCbmCosy2019ContFact;
-CbmMcbm2018ContFact::CbmMcbm2018ContFact() {
+CbmCosy2019ContFact::CbmCosy2019ContFact() {
// Constructor (called when the library is loaded)
- fName = "CbmMcbm2018ContFact";
+ fName = "CbmCosy2019ContFact";
fTitle = "Factory for parameter containers for fles test library";
setAllContainers();
FairRuntimeDb::instance()->addContFactory(this);
}
-void CbmMcbm2018ContFact::setAllContainers() {
+void CbmCosy2019ContFact::setAllContainers() {
/** Creates the Container objects with all accepted contexts and adds them to
* the list of containers for the fles test library.*/
FairContainer* pHodo =
- new FairContainer("CbmMcbm2018HodoPar",
+ new FairContainer("CbmCosy2019HodoPar",
"HODO at MCBM 2018 Unpack Parameters",
"TestDefaultContext");
pHodo->addContext("TestNonDefaultContext");
containers->Add(pHodo);
-
}
-FairParSet* CbmMcbm2018ContFact::createContainer(FairContainer* c) {
+FairParSet* CbmCosy2019ContFact::createContainer(FairContainer* c) {
/** Calls the constructor of the corresponding parameter container.
* For an actual context, which is not an empty string and not the default context
* of this container, the name is concatinated with the context. */
const char* name = c->GetName();
FairParSet* p = 0;
- if (strcmp(name, "CbmMcbm2018HodoPar") == 0) {
- p = new CbmMcbm2018HodoPar(
+ if (strcmp(name, "CbmCosy2019HodoPar") == 0) {
+ p = new CbmCosy2019HodoPar(
c->getConcatName().Data(), c->GetTitle(), c->getContext());
}
diff --git a/fles/cosy2019/parameter/CbmCosy2019ContFact.h b/fles/cosy2019/parameter/CbmCosy2019ContFact.h
new file mode 100644
index 0000000000000000000000000000000000000000..a98a9f349a9d7d1a3253764a554cf12d66f23f7b
--- /dev/null
+++ b/fles/cosy2019/parameter/CbmCosy2019ContFact.h
@@ -0,0 +1,22 @@
+#ifndef CBMCOSY2019CONTFACT_H
+#define CBMCOSY2019CONTFACT_H
+
+#include "FairContFact.h"
+
+class FairContainer;
+class FairParSet;
+
+class CbmCosy2019ContFact : public FairContFact {
+private:
+ void setAllContainers();
+ CbmCosy2019ContFact(const CbmCosy2019ContFact&);
+ CbmCosy2019ContFact& operator=(const CbmCosy2019ContFact&);
+
+public:
+ CbmCosy2019ContFact();
+ ~CbmCosy2019ContFact() {}
+ FairParSet* createContainer(FairContainer*);
+ ClassDef(CbmCosy2019ContFact, 0) // Factory for all mcbm parameter containers
+};
+
+#endif /* !CBMCOSY2019CONTFACT_H */
diff --git a/fles/cosy2019/parameter/CbmMcbm2018HodoPar.cxx b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
similarity index 78%
rename from fles/cosy2019/parameter/CbmMcbm2018HodoPar.cxx
rename to fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
index fab2be3cdf71920f4cb6ac0955677d01bfa885a6..5e8ea922e5cf5f111227fcfbbc3960c60f049d22 100644
--- a/fles/cosy2019/parameter/CbmMcbm2018HodoPar.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
@@ -1,9 +1,9 @@
// -------------------------------------------------------------------------
-// ----- CbmMcbm2018HodoPar source file -----
+// ----- CbmCosy2019HodoPar source file -----
// ----- Created 31/07/19 by P.-A. Loizeau -----
// -------------------------------------------------------------------------
-#include "CbmMcbm2018HodoPar.h"
+#include "CbmCosy2019HodoPar.h"
#include "FairDetParIo.h"
#include "FairLogger.h"
@@ -16,7 +16,7 @@
using namespace std;
// ----- Standard constructor ------------------------------------------
-CbmMcbm2018HodoPar::CbmMcbm2018HodoPar(const char* name,
+CbmCosy2019HodoPar::CbmCosy2019HodoPar(const char* name,
const char* title,
const char* context)
: FairParGenericSet(name, title, context)
@@ -41,12 +41,12 @@ CbmMcbm2018HodoPar::CbmMcbm2018HodoPar(const char* name,
// ----- Destructor ----------------------------------------------------
-CbmMcbm2018HodoPar::~CbmMcbm2018HodoPar() {}
+CbmCosy2019HodoPar::~CbmCosy2019HodoPar() {}
// -------------------------------------------------------------------------
// ----- Public method clear -------------------------------------------
-void CbmMcbm2018HodoPar::clear() {
+void CbmCosy2019HodoPar::clear() {
status = kFALSE;
resetInputVersions();
}
@@ -54,7 +54,7 @@ void CbmMcbm2018HodoPar::clear() {
// -------------------------------------------------------------------------
-void CbmMcbm2018HodoPar::putParams(FairParamList* l) {
+void CbmCosy2019HodoPar::putParams(FairParamList* l) {
if (!l) return;
l->add("NbModules", fuNbModules);
@@ -78,7 +78,7 @@ void CbmMcbm2018HodoPar::putParams(FairParamList* l) {
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018HodoPar::getParams(FairParamList* l) {
+Bool_t CbmCosy2019HodoPar::getParams(FairParamList* l) {
if (!l) return kFALSE;
@@ -119,137 +119,137 @@ Bool_t CbmMcbm2018HodoPar::getParams(FairParamList* l) {
return kTRUE;
}
// -------------------------------------------------------------------------
-Int_t CbmMcbm2018HodoPar::ElinkIdxToFebIdx(UInt_t uElink) {
+Int_t CbmCosy2019HodoPar::ElinkIdxToFebIdx(UInt_t uElink) {
//LOG(info) <<" uElink "<<uElink<<" kuNbElinksPerCrob "<<kuNbElinksPerCrob;
if (uElink < kuNbElinksPerCrob)
return kiCrobMapElinkFebIdx[uElink];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::ElinkIdxToFebIdx => Index out of bound, "
+ << "CbmCosy2019HodoPar::ElinkIdxToFebIdx => Index out of bound, "
<< "returning crazy value!";
return -1;
} // else of if( uElink < kuNbElinksPerCrob )
}
// -------------------------------------------------------------------------
-UInt_t CbmMcbm2018HodoPar::ElinkIdxToAsicIdxFebMuch(UInt_t uElink) {
+UInt_t CbmCosy2019HodoPar::ElinkIdxToAsicIdxFebMuch(UInt_t uElink) {
if (uElink < kuNbElinksPerCrob)
return kuCrobMapElinkFebMuch[uElink];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::ElinkIdxToAsicIdxFebMuch => Index out of bound, "
+ << "CbmCosy2019HodoPar::ElinkIdxToAsicIdxFebMuch => Index out of bound, "
<< "returning crazy value!";
return 0xFFFF;
} // else of if( uElink < kuNbElinksPerCrob )
}
// -------------------------------------------------------------------------
-UInt_t CbmMcbm2018HodoPar::ChannelToFiber(UInt_t uChan) {
+UInt_t CbmCosy2019HodoPar::ChannelToFiber(UInt_t uChan) {
if (uChan < kuNbChanPerAsic)
return kuChannelToFiberMap[uChan];
else {
- LOG(warning) << "CbmMcbm2018HodoPar::ChannelToFiber => Index out of bound, "
+ LOG(warning) << "CbmCosy2019HodoPar::ChannelToFiber => Index out of bound, "
<< "returning crazy value!";
return 0xFFFF;
} // else of if( uChan < kuNbChanPerAsic )
}
-UInt_t CbmMcbm2018HodoPar::ChannelToPixel(UInt_t uChan) {
+UInt_t CbmCosy2019HodoPar::ChannelToPixel(UInt_t uChan) {
if (uChan < kuNbChanPerAsic)
return kuChannelToPixelMap[uChan];
else {
- LOG(warning) << "CbmMcbm2018HodoPar::ChannelToPixel => Index out of bound, "
+ LOG(warning) << "CbmCosy2019HodoPar::ChannelToPixel => Index out of bound, "
<< "returning crazy value!";
return 0xFFFF;
} // else of if( uChan < kuNbChanPerAsic )
}
-UInt_t CbmMcbm2018HodoPar::ChannelToAxis(UInt_t uChan) {
+UInt_t CbmCosy2019HodoPar::ChannelToAxis(UInt_t uChan) {
if (uChan < kuNbChanPerAsic)
return kuChannelToPlaneMap[uChan];
else {
- LOG(warning) << "CbmMcbm2018HodoPar::ChannelToAxis => Index out of bound, "
+ LOG(warning) << "CbmCosy2019HodoPar::ChannelToAxis => Index out of bound, "
<< "returning crazy value!";
return 0xFFFF;
} // else of if( uChan < kuNbChanPerAsic )
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018HodoPar::CheckModuleIndex(UInt_t uModuleIdx) {
+Bool_t CbmCosy2019HodoPar::CheckModuleIndex(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return kTRUE;
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::CheckModuleIndex => Index out of bound!";
+ << "CbmCosy2019HodoPar::CheckModuleIndex => Index out of bound!";
return kFALSE;
} // else of if( uModuleIdx < fuNbModules )
}
-UInt_t CbmMcbm2018HodoPar::GetModuleAddress(UInt_t uModuleIdx) {
+UInt_t CbmCosy2019HodoPar::GetModuleAddress(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return fiModAddress[uModuleIdx];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetModuleAddress => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetModuleAddress => Index out of bound, "
<< "returning crazy value!";
return 0xFFFFFFFF;
} // else of if( uModuleIdx < fuNbModules )
}
-Double_t CbmMcbm2018HodoPar::GetModuleCenterPosX(UInt_t uModuleIdx) {
+Double_t CbmCosy2019HodoPar::GetModuleCenterPosX(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return fdModCenterPosX[uModuleIdx];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetModuleCenterPosX => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetModuleCenterPosX => Index out of bound, "
<< "returning crazy value!";
return 3.844e11; // Fly to the Moon!
} // else of if( uModuleIdx < fuNbModules )
}
-Double_t CbmMcbm2018HodoPar::GetModuleCenterPosY(UInt_t uModuleIdx) {
+Double_t CbmCosy2019HodoPar::GetModuleCenterPosY(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return fdModCenterPosY[uModuleIdx];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetModuleCenterPosY => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetModuleCenterPosY => Index out of bound, "
<< "returning crazy value!";
return 3.844e11; // Fly to the Moon!
} // else of if( uModuleIdx < fuNbModules )
}
-Bool_t CbmMcbm2018HodoPar::GetModuleSwapXY(UInt_t uModuleIdx) {
+Bool_t CbmCosy2019HodoPar::GetModuleSwapXY(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return fiModSwapXY[uModuleIdx];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetModuleSwapXY => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetModuleSwapXY => Index out of bound, "
<< "returning false!";
return kFALSE; // Fly to the Moon!
} // else of if( uModuleIdx < fuNbModules )
}
-Bool_t CbmMcbm2018HodoPar::GetModuleInvertX(UInt_t uModuleIdx) {
+Bool_t CbmCosy2019HodoPar::GetModuleInvertX(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return fiModInvertX[uModuleIdx];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetModuleInvertX => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetModuleInvertX => Index out of bound, "
<< "returning false!";
return kFALSE; // Fly to the Moon!
} // else of if( uModuleIdx < fuNbModules )
}
-Bool_t CbmMcbm2018HodoPar::GetModuleInvertY(UInt_t uModuleIdx) {
+Bool_t CbmCosy2019HodoPar::GetModuleInvertY(UInt_t uModuleIdx) {
if (uModuleIdx < fuNbModules)
return fiModInvertY[uModuleIdx];
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetModuleInvertY => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetModuleInvertY => Index out of bound, "
<< "returning false!";
return kFALSE; // Fly to the Moon!
} // else of if( uModuleIdx < fuNbModules )
}
// -------------------------------------------------------------------------
-UInt_t CbmMcbm2018HodoPar::GetDpbId(UInt_t uDpbIdx) {
+UInt_t CbmCosy2019HodoPar::GetDpbId(UInt_t uDpbIdx) {
if (uDpbIdx < fuNrOfDpbs)
return fiDbpIdArray[uDpbIdx];
else {
- LOG(warning) << "CbmMcbm2018HodoPar::GetDpbId => Index out of bound, "
+ LOG(warning) << "CbmCosy2019HodoPar::GetDpbId => Index out of bound, "
<< "returning crazy value!";
return 0xFFFFFFFF;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Bool_t CbmMcbm2018HodoPar::IsCrobActive(UInt_t uDpbIdx, UInt_t uCrobIdx) {
+Bool_t CbmCosy2019HodoPar::IsCrobActive(UInt_t uDpbIdx, UInt_t uCrobIdx) {
if (uDpbIdx < fuNrOfDpbs) {
if (uCrobIdx < kuNbCrobsPerDpb)
return 0 < fiCrobActiveFlag[uDpbIdx * kuNbCrobsPerDpb + uCrobIdx]
@@ -257,31 +257,31 @@ Bool_t CbmMcbm2018HodoPar::IsCrobActive(UInt_t uDpbIdx, UInt_t uCrobIdx) {
: kFALSE;
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::IsCrobActive => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::IsCrobActive => Crob Index out of bound, "
<< "returning default inactive!";
return kFALSE;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::IsCrobActive => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::IsCrobActive => Dpb Index out of bound, "
<< "returning default inactive!";
return kFALSE;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Bool_t CbmMcbm2018HodoPar::IsFebActive(UInt_t uFebInSystIdx) {
+Bool_t CbmCosy2019HodoPar::IsFebActive(UInt_t uFebInSystIdx) {
if (uFebInSystIdx < GetNrOfFebs()) {
return (-1 == fiFebModuleIdx[uFebInSystIdx] ? kFALSE : kTRUE);
} // if( uFebInSystIdx < GetNrOfFebs() )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::IsFebActive => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::IsFebActive => Feb Index out of bound, "
<< "returning default inactive!";
return kFALSE;
} // else of if( uFebInSystIdx < GetNrOfFebs() )
}
-Bool_t CbmMcbm2018HodoPar::IsFebActive(UInt_t uDpbIdx,
+Bool_t CbmCosy2019HodoPar::IsFebActive(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -293,26 +293,26 @@ Bool_t CbmMcbm2018HodoPar::IsFebActive(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::IsFebActive => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::IsFebActive => Feb Index out of bound, "
<< "returning default inactive!";
return kFALSE;
} // else of if( uFebIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::IsFebActive => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::IsFebActive => Crob Index out of bound, "
<< "returning default inactive!";
return kFALSE;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::IsFebActive => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::IsFebActive => Dpb Index out of bound, "
<< "returning default inactive!";
return kFALSE;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Int_t CbmMcbm2018HodoPar::GetFebModuleIdx(UInt_t uDpbIdx,
+Int_t CbmCosy2019HodoPar::GetFebModuleIdx(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -324,26 +324,26 @@ Int_t CbmMcbm2018HodoPar::GetFebModuleIdx(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebModuleIdx => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebModuleIdx => Feb Index out of bound, "
<< "returning default inactive!";
return -1;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebModuleIdx => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebModuleIdx => Crob Index out of bound, "
<< "returning default inactive!";
return -1;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebModuleIdx => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebModuleIdx => Dpb Index out of bound, "
<< "returning default inactive!";
return -1;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Double_t CbmMcbm2018HodoPar::GetFebAdcGain(UInt_t uDpbIdx,
+Double_t CbmCosy2019HodoPar::GetFebAdcGain(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -355,26 +355,26 @@ Double_t CbmMcbm2018HodoPar::GetFebAdcGain(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcGain => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcGain => Feb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcGain => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcGain => Crob Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcGain => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcGain => Dpb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Double_t CbmMcbm2018HodoPar::GetFebAdcOffset(UInt_t uDpbIdx,
+Double_t CbmCosy2019HodoPar::GetFebAdcOffset(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -387,26 +387,26 @@ Double_t CbmMcbm2018HodoPar::GetFebAdcOffset(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcOffset => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcOffset => Feb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcOffset => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcOffset => Crob Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcOffset => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcOffset => Dpb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Double_t CbmMcbm2018HodoPar::GetFebAdcBase(UInt_t uDpbIdx,
+Double_t CbmCosy2019HodoPar::GetFebAdcBase(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -418,26 +418,26 @@ Double_t CbmMcbm2018HodoPar::GetFebAdcBase(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcBase => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcBase => Feb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcBase => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcBase => Crob Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcBase => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcBase => Dpb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Double_t CbmMcbm2018HodoPar::GetFebAdcThrGain(UInt_t uDpbIdx,
+Double_t CbmCosy2019HodoPar::GetFebAdcThrGain(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -449,26 +449,26 @@ Double_t CbmMcbm2018HodoPar::GetFebAdcThrGain(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcThrGain => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcThrGain => Feb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcThrGain => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcThrGain => Crob Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcThrGain => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcThrGain => Dpb Index out of bound, "
<< "returning default value!";
return 0.0;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
-Int_t CbmMcbm2018HodoPar::GetFebAdcThrOffs(UInt_t uDpbIdx,
+Int_t CbmCosy2019HodoPar::GetFebAdcThrOffs(UInt_t uDpbIdx,
UInt_t uCrobIdx,
UInt_t uFebIdx) {
if (uDpbIdx < fuNrOfDpbs) {
@@ -480,27 +480,27 @@ Int_t CbmMcbm2018HodoPar::GetFebAdcThrOffs(UInt_t uDpbIdx,
} // if( uFebIdx < kuNbFebsPerCrob )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcThrOffs => Feb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcThrOffs => Feb Index out of bound, "
<< "returning default value!";
return 0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uCrobIdx < kuNbCrobsPerDpb )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcThrOffs => Crob Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcThrOffs => Crob Index out of bound, "
<< "returning default value!";
return 0;
} // else of if( uCrobIdx < kuNbCrobsPerDpb )
} // if( uDpbIdx < fuNrOfDpbs )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetFebAdcThrOffs => Dpb Index out of bound, "
+ << "CbmCosy2019HodoPar::GetFebAdcThrOffs => Dpb Index out of bound, "
<< "returning default value!";
return 0;
} // else of if( uDpbIdx < fuNrOfDpbs )
}
// -------------------------------------------------------------------------
-UInt_t CbmMcbm2018HodoPar::GetChannelInModule(UInt_t uModuleIdx, UInt_t uChan) {
+UInt_t CbmCosy2019HodoPar::GetChannelInModule(UInt_t uModuleIdx, UInt_t uChan) {
if (uModuleIdx < fuNbModules || uChan < kuNbChanPerAsic) {
UInt_t uAxis = ChannelToAxis(uChan);
UInt_t uChanInAxis = ChannelToFiber(uChan);
@@ -519,11 +519,11 @@ UInt_t CbmMcbm2018HodoPar::GetChannelInModule(UInt_t uModuleIdx, UInt_t uChan) {
} // if( uModuleIdx < fuNbModules || uChan < kuNbChanPerAsic )
else {
LOG(warning)
- << "CbmMcbm2018HodoPar::GetChannelInModule => Index out of bound, "
+ << "CbmCosy2019HodoPar::GetChannelInModule => Index out of bound, "
<< "returning crazy value!";
return 0xFFFF;
} // else of if( uModuleIdx < fuNbModules || uChan < kuNbChanPerAsic )
}
// -------------------------------------------------------------------------
-ClassImp(CbmMcbm2018HodoPar)
+ClassImp(CbmCosy2019HodoPar)
diff --git a/fles/cosy2019/parameter/CbmMcbm2018HodoPar.h b/fles/cosy2019/parameter/CbmCosy2019HodoPar.h
similarity index 96%
rename from fles/cosy2019/parameter/CbmMcbm2018HodoPar.h
rename to fles/cosy2019/parameter/CbmCosy2019HodoPar.h
index 3fb20895d5a16f0f43b99753f9ed2e79ca87d102..58e68ec14fcf54b1a5e93fd7581a70779923761f 100644
--- a/fles/cosy2019/parameter/CbmMcbm2018HodoPar.h
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.h
@@ -1,10 +1,10 @@
// -------------------------------------------------------------------------
-// ----- CbmMcbm2018HodoPar header file -----
+// ----- CbmCosy2019HodoPar header file -----
// ----- Created 31/07/19 by P.-A. Loizeau -----
// -------------------------------------------------------------------------
-#ifndef CBMMCBM2018HODOPAR_H
-#define CBMMCBM2018HODOPAR_H
+#ifndef CBMCOSY2019HODOPAR_H
+#define CBMCOSY2019HODOPAR_H
#include "FairParGenericSet.h"
@@ -15,17 +15,17 @@ class FairParIo;
class FairParamList;
-class CbmMcbm2018HodoPar : public FairParGenericSet {
+class CbmCosy2019HodoPar : public FairParGenericSet {
public:
/** Standard constructor **/
- CbmMcbm2018HodoPar(const char* name = "CbmMcbm2018HodoPar",
+ CbmCosy2019HodoPar(const char* name = "CbmCosy2019HodoPar",
const char* title = "Much parameters",
const char* context = "Default");
/** Destructor **/
- virtual ~CbmMcbm2018HodoPar();
+ virtual ~CbmCosy2019HodoPar();
/** Reset all parameters **/
virtual void clear();
@@ -187,6 +187,6 @@ private:
TArrayI
fiFebAdcThrOffs; // Thr. offset in Units vs Cal. Thr. for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ]
- ClassDef(CbmMcbm2018HodoPar, 1);
+ ClassDef(CbmCosy2019HodoPar, 1);
};
-#endif // CBMMCBM2018HODOPAR_H
+#endif // CBMCOSY2019HODOPAR_H
diff --git a/fles/cosy2019/parameter/CbmMcbm2018ContFact.h b/fles/cosy2019/parameter/CbmMcbm2018ContFact.h
deleted file mode 100644
index 741ace8200bb3c3eabdd64fd6baacd929cae9c83..0000000000000000000000000000000000000000
--- a/fles/cosy2019/parameter/CbmMcbm2018ContFact.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef CBMMCBM2018CONTFACT_H
-#define CBMMCBM2018CONTFACT_H
-
-#include "FairContFact.h"
-
-class FairContainer;
-class FairParSet;
-
-class CbmMcbm2018ContFact : public FairContFact {
-private:
- void setAllContainers();
- CbmMcbm2018ContFact(const CbmMcbm2018ContFact&);
- CbmMcbm2018ContFact& operator=(const CbmMcbm2018ContFact&);
-
-public:
- CbmMcbm2018ContFact();
- ~CbmMcbm2018ContFact() {}
- FairParSet* createContainer(FairContainer*);
- ClassDef(CbmMcbm2018ContFact, 0) // Factory for all mcbm parameter containers
-};
-
-#endif /* !CBMMCBM2018CONTFACT_H */
diff --git a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
similarity index 96%
rename from fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
rename to fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
index 472b0da7ceaaa821538c7a1382b7fc4a123b90bc..65a53cf711754588befbb9804d5fc26fb0eeb4cb 100644
--- a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
@@ -1,14 +1,14 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018UnpackerAlgoHodo -----
+// ----- CbmCosy2019UnpackerAlgoHodo -----
// ----- Created 31/07/19 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#include "CbmMcbm2018UnpackerAlgoHodo.h"
+#include "CbmCosy2019UnpackerAlgoHodo.h"
+#include "CbmCosy2019HodoPar.h"
#include "CbmFormatMsHeaderPrintout.h"
-#include "CbmMcbm2018HodoPar.h"
#include <Logger.h>
@@ -26,7 +26,7 @@
#include <stdint.h>
// -------------------------------------------------------------------------
-CbmMcbm2018UnpackerAlgoHodo::CbmMcbm2018UnpackerAlgoHodo()
+CbmCosy2019UnpackerAlgoHodo::CbmCosy2019UnpackerAlgoHodo()
: CbmStar2019Algo()
,
/// From the class itself
@@ -73,7 +73,7 @@ CbmMcbm2018UnpackerAlgoHodo::CbmMcbm2018UnpackerAlgoHodo()
fcTimeToTrigRaw( nullptr )
*/
{}
-CbmMcbm2018UnpackerAlgoHodo::~CbmMcbm2018UnpackerAlgoHodo() {
+CbmCosy2019UnpackerAlgoHodo::~CbmCosy2019UnpackerAlgoHodo() {
/// Clear buffers
fvmHitsInMs.clear();
/*
@@ -85,45 +85,45 @@ CbmMcbm2018UnpackerAlgoHodo::~CbmMcbm2018UnpackerAlgoHodo() {
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018UnpackerAlgoHodo::Init() {
+Bool_t CbmCosy2019UnpackerAlgoHodo::Init() {
LOG(info) << "Initializing mCBM STS 2019 unpacker algo";
return kTRUE;
}
-void CbmMcbm2018UnpackerAlgoHodo::Reset() {}
-void CbmMcbm2018UnpackerAlgoHodo::Finish() {
+void CbmCosy2019UnpackerAlgoHodo::Reset() {}
+void CbmCosy2019UnpackerAlgoHodo::Finish() {
/// Printout Goodbye message and stats
/// Write Output histos
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018UnpackerAlgoHodo::InitContainers() {
- LOG(info) << "Init parameter containers for CbmMcbm2018UnpackerAlgoHodo";
+Bool_t CbmCosy2019UnpackerAlgoHodo::InitContainers() {
+ LOG(info) << "Init parameter containers for CbmCosy2019UnpackerAlgoHodo";
Bool_t initOK = ReInitContainers();
return initOK;
}
-Bool_t CbmMcbm2018UnpackerAlgoHodo::ReInitContainers() {
+Bool_t CbmCosy2019UnpackerAlgoHodo::ReInitContainers() {
LOG(info) << "**********************************************";
- LOG(info) << "ReInit parameter containers for CbmMcbm2018UnpackerAlgoHodo";
+ LOG(info) << "ReInit parameter containers for CbmCosy2019UnpackerAlgoHodo";
fUnpackPar =
- (CbmMcbm2018HodoPar*) fParCList->FindObject("CbmMcbm2018HodoPar");
+ (CbmCosy2019HodoPar*) fParCList->FindObject("CbmCosy2019HodoPar");
if (nullptr == fUnpackPar) return kFALSE;
Bool_t initOK = InitParameters();
return initOK;
}
-TList* CbmMcbm2018UnpackerAlgoHodo::GetParList() {
+TList* CbmCosy2019UnpackerAlgoHodo::GetParList() {
if (nullptr == fParCList) fParCList = new TList();
- fUnpackPar = new CbmMcbm2018HodoPar("CbmMcbm2018HodoPar");
+ fUnpackPar = new CbmCosy2019HodoPar("CbmCosy2019HodoPar");
fParCList->Add(fUnpackPar);
return fParCList;
}
-Bool_t CbmMcbm2018UnpackerAlgoHodo::InitParameters() {
+Bool_t CbmCosy2019UnpackerAlgoHodo::InitParameters() {
fuNbModules = fUnpackPar->GetNbOfModules();
LOG(info) << "Nr. of STS Modules: " << fuNbModules;
@@ -255,7 +255,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::InitParameters() {
}
// -------------------------------------------------------------------------
-void CbmMcbm2018UnpackerAlgoHodo::AddMsComponentToList(size_t component,
+void CbmCosy2019UnpackerAlgoHodo::AddMsComponentToList(size_t component,
UShort_t usDetectorId) {
/// Check for duplicates and ignore if it is the case
for (UInt_t uCompIdx = 0; uCompIdx < fvMsComponentsList.size(); ++uCompIdx)
@@ -264,13 +264,13 @@ void CbmMcbm2018UnpackerAlgoHodo::AddMsComponentToList(size_t component,
/// Add to list
fvMsComponentsList.push_back(component);
- LOG(info) << "CbmMcbm2018UnpackerAlgoHodo::AddMsComponentToList => Component "
+ LOG(info) << "CbmCosy2019UnpackerAlgoHodo::AddMsComponentToList => Component "
<< component << " with detector ID 0x" << std::hex << usDetectorId
<< std::dec << " added to list";
}
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessTs(const fles::Timeslice& ts) {
+Bool_t CbmCosy2019UnpackerAlgoHodo::ProcessTs(const fles::Timeslice& ts) {
fulCurrentTsIdx = ts.index();
fdTsStartTime = static_cast<Double_t>(ts.descriptor(0, 0).idx);
@@ -372,7 +372,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessTs(const fles::Timeslice& ts) {
return kTRUE;
}
-Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessMs(const fles::Timeslice& ts,
+Bool_t CbmCosy2019UnpackerAlgoHodo::ProcessMs(const fles::Timeslice& ts,
size_t uMsCompIdx,
size_t uMsIdx) {
auto msDescriptor = ts.descriptor(uMsCompIdx, uMsIdx);
@@ -479,7 +479,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessMs(const fles::Timeslice& ts,
Int_t uFebIdx = fUnpackPar->ElinkIdxToFebIdx(usElinkIdx);
if (-1 == uFebIdx) {
- LOG(warning) << "CbmMcbm2018UnpackerAlgoHodo::DoUnpack => "
+ LOG(warning) << "CbmCosy2019UnpackerAlgoHodo::DoUnpack => "
<< "Wrong elink Idx! Elink raw "
<< Form("%d remap %d", usElinkIdx, uFebIdx);
continue;
@@ -506,7 +506,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessMs(const fles::Timeslice& ts,
ProcessEpochInfo(pMess[uIdx]);
if (0 < uIdx)
- LOG(info) << "CbmMcbm2018UnpackerAlgoHodo::DoUnpack => "
+ LOG(info) << "CbmCosy2019UnpackerAlgoHodo::DoUnpack => "
<< "EPOCH message at unexpected position in MS: message "
<< uIdx << " VS message 0 expected!";
break;
@@ -527,7 +527,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessMs(const fles::Timeslice& ts,
break;
} // case stsxyter::MessType::Dummy / ReadDataAck / Ack :
default: {
- LOG(fatal) << "CbmMcbm2018UnpackerAlgoHodo::DoUnpack => "
+ LOG(fatal) << "CbmCosy2019UnpackerAlgoHodo::DoUnpack => "
<< "Unknown message type, should never happen, stopping "
"here! Type found was: "
<< static_cast<int>(typeMess);
@@ -539,7 +539,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::ProcessMs(const fles::Timeslice& ts,
}
// -------------------------------------------------------------------------
-void CbmMcbm2018UnpackerAlgoHodo::ProcessHitInfo(const stsxyter::Message& mess,
+void CbmCosy2019UnpackerAlgoHodo::ProcessHitInfo(const stsxyter::Message& mess,
const UShort_t& usElinkIdx,
const UInt_t& uAsicIdx,
const UInt_t& /*uMsIdx*/) {
@@ -626,7 +626,7 @@ void CbmMcbm2018UnpackerAlgoHodo::ProcessHitInfo(const stsxyter::Message& mess,
*/
}
-void CbmMcbm2018UnpackerAlgoHodo::ProcessTsMsbInfo(
+void CbmCosy2019UnpackerAlgoHodo::ProcessTsMsbInfo(
const stsxyter::Message& mess,
UInt_t uMessIdx,
UInt_t uMsIdx) {
@@ -689,7 +689,7 @@ void CbmMcbm2018UnpackerAlgoHodo::ProcessTsMsbInfo(
*/
}
-void CbmMcbm2018UnpackerAlgoHodo::ProcessEpochInfo(
+void CbmCosy2019UnpackerAlgoHodo::ProcessEpochInfo(
const stsxyter::Message& /*mess*/) {
// UInt_t uVal = mess.GetEpochVal();
// UInt_t uCurrentCycle = uVal % stsxyter::kulTsCycleNbBins;
@@ -704,7 +704,7 @@ void CbmMcbm2018UnpackerAlgoHodo::ProcessEpochInfo(
*/
}
-void CbmMcbm2018UnpackerAlgoHodo::ProcessStatusInfo(
+void CbmCosy2019UnpackerAlgoHodo::ProcessStatusInfo(
const stsxyter::Message& /*mess*/) {
/*
UInt_t uCrobIdx = usElinkIdx / fUnpackPar->GetNbElinkPerCrob();
@@ -729,7 +729,7 @@ void CbmMcbm2018UnpackerAlgoHodo::ProcessStatusInfo(
// -------------------------------------------------------------------------
-Bool_t CbmMcbm2018UnpackerAlgoHodo::CreateHistograms() {
+Bool_t CbmCosy2019UnpackerAlgoHodo::CreateHistograms() {
/// Create General unpacking histograms
fhDigisTimeInRun =
new TH1I("hStsDigisTimeInRun",
@@ -990,13 +990,13 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::CreateHistograms() {
*/
return kTRUE;
}
-Bool_t CbmMcbm2018UnpackerAlgoHodo::FillHistograms() {
+Bool_t CbmCosy2019UnpackerAlgoHodo::FillHistograms() {
for (auto itHit = fDigiVect.begin(); itHit != fDigiVect.end(); ++itHit) {
fhDigisTimeInRun->Fill(itHit->GetTime() * 1e-9);
} // for( auto itHit = fDigiVect.begin(); itHit != fDigiVect.end(); ++itHit)
return kTRUE;
}
-Bool_t CbmMcbm2018UnpackerAlgoHodo::ResetHistograms() {
+Bool_t CbmCosy2019UnpackerAlgoHodo::ResetHistograms() {
fhDigisTimeInRun->Reset();
/*
for( UInt_t uGdpb = 0; uGdpb < fuNrOfGdpbs; ++uGdpb )
@@ -1033,7 +1033,7 @@ Bool_t CbmMcbm2018UnpackerAlgoHodo::ResetHistograms() {
}
// -------------------------------------------------------------------------
-void CbmMcbm2018UnpackerAlgoHodo::SetTimeOffsetNsAsic(UInt_t uAsicIdx,
+void CbmCosy2019UnpackerAlgoHodo::SetTimeOffsetNsAsic(UInt_t uAsicIdx,
Double_t dOffsetIn) {
if (uAsicIdx >= fvdTimeOffsetNsAsics.size()) {
fvdTimeOffsetNsAsics.resize(uAsicIdx + 1, 0.0);
diff --git a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.h b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
similarity index 92%
rename from fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
rename to fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
index 0d5c0f217e795bb526347e4566c7f59ef8b37187..31d4e372f732b72dcff1662f3d627b119f2d092d 100644
--- a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
@@ -1,12 +1,12 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018UnpackerAlgoHodo -----
+// ----- CbmCosy2019UnpackerAlgoHodo -----
// ----- Created 31/07/19 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#ifndef CbmMcbm2018UnpackerAlgoHodo_H
-#define CbmMcbm2018UnpackerAlgoHodo_H
+#ifndef CbmCosy2019UnpackerAlgoHodo_H
+#define CbmCosy2019UnpackerAlgoHodo_H
#include "CbmStar2019Algo.h"
@@ -28,14 +28,14 @@
#include <map>
#include <vector>
-class CbmMcbm2018HodoPar;
+class CbmCosy2019HodoPar;
class TProfile;
-class CbmMcbm2018UnpackerAlgoHodo : public CbmStar2019Algo<CbmStsDigi> {
+class CbmCosy2019UnpackerAlgoHodo : public CbmStar2019Algo<CbmStsDigi> {
public:
- CbmMcbm2018UnpackerAlgoHodo();
- ~CbmMcbm2018UnpackerAlgoHodo();
+ CbmCosy2019UnpackerAlgoHodo();
+ ~CbmCosy2019UnpackerAlgoHodo();
virtual Bool_t Init();
virtual void Reset();
@@ -80,7 +80,7 @@ private:
std::vector<Bool_t> fvbMaskedComponents;
/// Settings from parameter file
- CbmMcbm2018HodoPar* fUnpackPar; //!
+ CbmCosy2019HodoPar* fUnpackPar; //!
/// Readout chain dimensions and mapping
UInt_t fuNbModules; //! Total number of STS modules in the setup
std::vector<Int_t>
@@ -170,10 +170,10 @@ private:
void ProcessEpochInfo(const stsxyter::Message& mess);
void ProcessStatusInfo(const stsxyter::Message& mess);
- CbmMcbm2018UnpackerAlgoHodo(const CbmMcbm2018UnpackerAlgoHodo&);
- CbmMcbm2018UnpackerAlgoHodo operator=(const CbmMcbm2018UnpackerAlgoHodo&);
+ CbmCosy2019UnpackerAlgoHodo(const CbmCosy2019UnpackerAlgoHodo&);
+ CbmCosy2019UnpackerAlgoHodo operator=(const CbmCosy2019UnpackerAlgoHodo&);
- ClassDef(CbmMcbm2018UnpackerAlgoHodo, 1)
+ ClassDef(CbmCosy2019UnpackerAlgoHodo, 1)
};
-#endif // CbmMcbm2018UnpackerAlgoHodo_H
+#endif // CbmCosy2019UnpackerAlgoHodo_H
diff --git a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
similarity index 84%
rename from fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
rename to fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
index d68a591b7f3d9f0f981ca31fb2fa5f591bc0dffe..bd153e0f6197f4f4c04df344232aef1ea10573b7 100644
--- a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
@@ -1,14 +1,14 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018UnpackerTaskHodo -----
+// ----- CbmCosy2019UnpackerTaskHodo -----
// ----- Created 31/07/19 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#include "CbmMcbm2018UnpackerTaskHodo.h"
+#include "CbmCosy2019UnpackerTaskHodo.h"
-#include "CbmMcbm2018HodoPar.h"
-#include "CbmMcbm2018UnpackerAlgoHodo.h"
+#include "CbmCosy2019HodoPar.h"
+#include "CbmCosy2019UnpackerAlgoHodo.h"
//#include "CbmMcbm2018StsPar.h"
#include "CbmMcbm2018UnpackerAlgoSts.h"
@@ -32,33 +32,33 @@
#include <iostream>
#include <stdint.h>
-Bool_t bMcbm2018UnpackerTaskHodoResetHistos = kFALSE;
+Bool_t bCosy2019UnpackerTaskHodoResetHistos = kFALSE;
-CbmMcbm2018UnpackerTaskHodo::CbmMcbm2018UnpackerTaskHodo(UInt_t /*uNbGdpb*/)
+CbmCosy2019UnpackerTaskHodo::CbmCosy2019UnpackerTaskHodo(UInt_t /*uNbGdpb*/)
: CbmMcbmUnpack()
, fbMonitorMode(kFALSE)
, fbWriteOutput(kTRUE)
, fvChanMasks()
, fulTsCounter(0)
, fUnpackerAlgo(nullptr) {
- fUnpackerAlgo = new CbmMcbm2018UnpackerAlgoHodo();
+ fUnpackerAlgo = new CbmCosy2019UnpackerAlgoHodo();
fUnpackerAlgoSts = new CbmMcbm2018UnpackerAlgoSts();
}
-CbmMcbm2018UnpackerTaskHodo::~CbmMcbm2018UnpackerTaskHodo() {
+CbmCosy2019UnpackerTaskHodo::~CbmCosy2019UnpackerTaskHodo() {
delete fUnpackerAlgo;
delete fUnpackerAlgoSts;
}
-Bool_t CbmMcbm2018UnpackerTaskHodo::Init() {
- LOG(info) << "CbmMcbm2018UnpackerTaskHodo::Init";
+Bool_t CbmCosy2019UnpackerTaskHodo::Init() {
+ LOG(info) << "CbmCosy2019UnpackerTaskHodo::Init";
LOG(info) << "Initializing mCBM STS 2018 Unpacker";
FairRootManager* ioman = FairRootManager::Instance();
if (NULL == ioman) { LOG(fatal) << "No FairRootManager instance"; }
/// WARNING: incompatible with the hodoscopes unpacker!!!!
if (nullptr != ioman->InitObjectAs<std::vector<CbmStsDigi> const*>("StsDigi"))
- LOG(fatal) << "CbmMcbm2018UnpackerTaskHodo::Init => output vector already "
+ LOG(fatal) << "CbmCosy2019UnpackerTaskHodo::Init => output vector already "
"registered,"
<< " probably by CbmMcbm2018UnpackerTaskSts" << std::endl
<< " THESE TWO CLASSES ARE INCOMPATIBLE!";
@@ -74,7 +74,7 @@ Bool_t CbmMcbm2018UnpackerTaskHodo::Init() {
return kTRUE;
}
-void CbmMcbm2018UnpackerTaskHodo::SetParContainers() {
+void CbmCosy2019UnpackerTaskHodo::SetParContainers() {
LOG(info) << "Setting parameter containers for " << GetName();
TList* fParCList = fUnpackerAlgo->GetParList();
@@ -118,14 +118,14 @@ void CbmMcbm2018UnpackerTaskHodo::SetParContainers() {
} // for( Int_t iparC = 0; iparC < fParCList->GetEntries(); ++iparC )
}
-Bool_t CbmMcbm2018UnpackerTaskHodo::InitContainers() {
+Bool_t CbmCosy2019UnpackerTaskHodo::InitContainers() {
LOG(info) << "Init parameter containers for " << GetName();
/// Control flags
- CbmMcbm2018HodoPar* pUnpackPar = dynamic_cast<CbmMcbm2018HodoPar*>(
- FairRun::Instance()->GetRuntimeDb()->getContainer("CbmMcbm2018HodoPar"));
+ CbmCosy2019HodoPar* pUnpackPar = dynamic_cast<CbmCosy2019HodoPar*>(
+ FairRun::Instance()->GetRuntimeDb()->getContainer("CbmCosy2019HodoPar"));
if (nullptr == pUnpackPar) {
- LOG(error) << "Failed to obtain parameter container CbmMcbm2018HodoPar";
+ LOG(error) << "Failed to obtain parameter container CbmCosy2019HodoPar";
return kFALSE;
} // if( nullptr == pUnpackPar )
/*
@@ -162,7 +162,7 @@ Bool_t CbmMcbm2018UnpackerTaskHodo::InitContainers() {
} // for( UInt_t uHisto = 0; uHisto < vHistos.size(); ++uHisto )
server->RegisterCommand("/Reset_UnpHodo_Hist",
- "bMcbm2018UnpackerTaskHodoResetHistos=kTRUE");
+ "bCosy2019UnpackerTaskHodoResetHistos=kTRUE");
server->Restrict("/Reset_UnpHodo_Hist", "allow=admin");
} // if( nullptr != server )
@@ -179,7 +179,7 @@ Bool_t CbmMcbm2018UnpackerTaskHodo::InitContainers() {
return initOK;
}
-Bool_t CbmMcbm2018UnpackerTaskHodo::ReInitContainers() {
+Bool_t CbmCosy2019UnpackerTaskHodo::ReInitContainers() {
LOG(info) << "ReInit parameter containers for " << GetName();
Bool_t initOK = fUnpackerAlgo->ReInitContainers();
initOK &= fUnpackerAlgoSts->ReInitContainers();
@@ -187,20 +187,20 @@ Bool_t CbmMcbm2018UnpackerTaskHodo::ReInitContainers() {
return initOK;
}
-void CbmMcbm2018UnpackerTaskHodo::AddMsComponentToList(size_t component,
+void CbmCosy2019UnpackerTaskHodo::AddMsComponentToList(size_t component,
UShort_t usDetectorId) {
fUnpackerAlgo->AddMsComponentToList(component, usDetectorId);
fUnpackerAlgoSts->AddMsComponentToList(component, usDetectorId);
}
-Bool_t CbmMcbm2018UnpackerTaskHodo::DoUnpack(const fles::Timeslice& ts,
+Bool_t CbmCosy2019UnpackerTaskHodo::DoUnpack(const fles::Timeslice& ts,
size_t /*component*/) {
- if (fbMonitorMode && bMcbm2018UnpackerTaskHodoResetHistos) {
+ if (fbMonitorMode && bCosy2019UnpackerTaskHodoResetHistos) {
LOG(info) << "Reset Hodo + STS unpacker histos ";
fUnpackerAlgo->ResetHistograms();
fUnpackerAlgoSts->ResetHistograms();
- bMcbm2018UnpackerTaskHodoResetHistos = kFALSE;
- } // if( fbMonitorMode && bMcbm2018UnpackerTaskHodoResetHistos )
+ bCosy2019UnpackerTaskHodoResetHistos = kFALSE;
+ } // if( fbMonitorMode && bCosy2019UnpackerTaskHodoResetHistos )
if (kFALSE == fUnpackerAlgo->ProcessTs(ts)) {
LOG(error) << "Failed processing TS " << ts.index()
@@ -252,12 +252,12 @@ Bool_t CbmMcbm2018UnpackerTaskHodo::DoUnpack(const fles::Timeslice& ts,
return kTRUE;
}
-void CbmMcbm2018UnpackerTaskHodo::Reset() {
+void CbmCosy2019UnpackerTaskHodo::Reset() {
fpvDigiSts->clear();
fpvErrorSts->clear();
}
-void CbmMcbm2018UnpackerTaskHodo::Finish() {
+void CbmCosy2019UnpackerTaskHodo::Finish() {
/// If monitor mode enabled, trigger histos creation, obtain pointer on them and add them to the HTTP server
if (kTRUE == fbMonitorMode) {
/// Obtain vector of pointers on each histo from the algo (+ optionally desired folder)
@@ -298,37 +298,37 @@ void CbmMcbm2018UnpackerTaskHodo::Finish() {
} // if( kTRUE == fbMonitorMode )
}
-void CbmMcbm2018UnpackerTaskHodo::SetIgnoreOverlapMs(Bool_t bFlagIn) {
+void CbmCosy2019UnpackerTaskHodo::SetIgnoreOverlapMs(Bool_t bFlagIn) {
fUnpackerAlgo->SetIgnoreOverlapMs(bFlagIn);
fUnpackerAlgoSts->SetIgnoreOverlapMs(bFlagIn);
}
-void CbmMcbm2018UnpackerTaskHodo::SetTimeOffsetNs(Double_t dOffsetIn) {
+void CbmCosy2019UnpackerTaskHodo::SetTimeOffsetNs(Double_t dOffsetIn) {
fUnpackerAlgo->SetTimeOffsetNs(dOffsetIn);
}
-void CbmMcbm2018UnpackerTaskHodo::SetTimeOffsetNsSts(Double_t dOffsetIn) {
+void CbmCosy2019UnpackerTaskHodo::SetTimeOffsetNsSts(Double_t dOffsetIn) {
fUnpackerAlgoSts->SetTimeOffsetNs(dOffsetIn);
}
-void CbmMcbm2018UnpackerTaskHodo::SetTimeOffsetNsAsic(UInt_t uAsicIdx,
+void CbmCosy2019UnpackerTaskHodo::SetTimeOffsetNsAsic(UInt_t uAsicIdx,
Double_t dOffsetIn) {
fUnpackerAlgo->SetTimeOffsetNsAsic(uAsicIdx, dOffsetIn);
}
-void CbmMcbm2018UnpackerTaskHodo::SetTimeOffsetNsAsicSts(UInt_t uAsicIdx,
+void CbmCosy2019UnpackerTaskHodo::SetTimeOffsetNsAsicSts(UInt_t uAsicIdx,
Double_t dOffsetIn) {
fUnpackerAlgoSts->SetTimeOffsetNsAsic(uAsicIdx, dOffsetIn);
}
-void CbmMcbm2018UnpackerTaskHodo::MaskNoisyChannelSts(UInt_t uFeb,
+void CbmCosy2019UnpackerTaskHodo::MaskNoisyChannelSts(UInt_t uFeb,
UInt_t uChan,
Bool_t bMasked) {
fvChanMasks.push_back(FebChanMaskSts {uFeb, uChan, bMasked});
}
-void CbmMcbm2018UnpackerTaskHodo::SetAdcCutSts(UInt_t uAdc) {
+void CbmCosy2019UnpackerTaskHodo::SetAdcCutSts(UInt_t uAdc) {
fUnpackerAlgoSts->SetAdcCut(uAdc);
}
-ClassImp(CbmMcbm2018UnpackerTaskHodo)
+ClassImp(CbmCosy2019UnpackerTaskHodo)
diff --git a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.h b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
similarity index 80%
rename from fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.h
rename to fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
index 04310b726bcf182b77e2ae136920de52c7b8944a..746b11853c3d51ce4bd8d119ae8394d946ef6986 100644
--- a/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.h
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
@@ -1,12 +1,12 @@
// -----------------------------------------------------------------------------
// ----- -----
-// ----- CbmMcbm2018UnpackerTaskHodo -----
+// ----- CbmCosy2019UnpackerTaskHodo -----
// ----- Created 31/07/19 by P.-A. Loizeau -----
// ----- -----
// -----------------------------------------------------------------------------
-#ifndef CbmMcbm2018UnpackerTaskHodo_H
-#define CbmMcbm2018UnpackerTaskHodo_H
+#ifndef CbmCosy2019UnpackerTaskHodo_H
+#define CbmCosy2019UnpackerTaskHodo_H
#include "Timeslice.hpp"
@@ -14,7 +14,7 @@
#include "CbmMcbmUnpack.h"
#include "CbmStsDigi.h"
-class CbmMcbm2018UnpackerAlgoHodo;
+class CbmCosy2019UnpackerAlgoHodo;
class CbmMcbm2018UnpackerAlgoSts;
struct FebChanMaskSts {
@@ -23,15 +23,15 @@ struct FebChanMaskSts {
Bool_t bMasked;
};
-class CbmMcbm2018UnpackerTaskHodo : public CbmMcbmUnpack {
+class CbmCosy2019UnpackerTaskHodo : public CbmMcbmUnpack {
public:
- CbmMcbm2018UnpackerTaskHodo(UInt_t uNbSdpb = 1);
+ CbmCosy2019UnpackerTaskHodo(UInt_t uNbSdpb = 1);
- CbmMcbm2018UnpackerTaskHodo(const CbmMcbm2018UnpackerTaskHodo&) = delete;
- CbmMcbm2018UnpackerTaskHodo
- operator=(const CbmMcbm2018UnpackerTaskHodo&) = delete;
+ CbmCosy2019UnpackerTaskHodo(const CbmCosy2019UnpackerTaskHodo&) = delete;
+ CbmCosy2019UnpackerTaskHodo
+ operator=(const CbmCosy2019UnpackerTaskHodo&) = delete;
- virtual ~CbmMcbm2018UnpackerTaskHodo();
+ virtual ~CbmCosy2019UnpackerTaskHodo();
virtual Bool_t Init();
virtual Bool_t DoUnpack(const fles::Timeslice& ts, size_t component);
@@ -85,10 +85,10 @@ private:
std::vector<CbmErrorMessage>* fpvErrorSts = nullptr;
/// Processing algo
- CbmMcbm2018UnpackerAlgoHodo* fUnpackerAlgo;
+ CbmCosy2019UnpackerAlgoHodo* fUnpackerAlgo;
CbmMcbm2018UnpackerAlgoSts* fUnpackerAlgoSts = nullptr;
- ClassDef(CbmMcbm2018UnpackerTaskHodo, 1)
+ ClassDef(CbmCosy2019UnpackerTaskHodo, 1)
};
#endif
diff --git a/macro/beamtime/cosy2019/MonitorHodo.C b/macro/beamtime/cosy2019/MonitorHodo.C
index 37e852a6f999ac8007fc109f1e2e4f08ce288321..45ea6fd59828b52be0102e701af4667e0c60eabe 100644
--- a/macro/beamtime/cosy2019/MonitorHodo.C
+++ b/macro/beamtime/cosy2019/MonitorHodo.C
@@ -51,7 +51,7 @@ void MonitorHodo(TString inFile = "",
std::cout << ">>> MonitorHodo: Initialising..." << std::endl;
// Hodoscopes Monitor
- CbmMcbm2018MonitorTaskHodo* monitorHodo = new CbmMcbm2018MonitorTaskHodo();
+ CbmCosy2019MonitorTaskHodo* monitorHodo = new CbmCosy2019MonitorTaskHodo();
monitorHodo->SetIgnoreOverlapMs();
monitorHodo->SetDpbId(0x4efb);
monitorHodo->SetHodoElinkIdx(5, 10);
diff --git a/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C b/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C
index ffddca6b796eff93af66484e5cd7ca55305ba79c..39f7149d68d9399e39f40937d425197906d8ee3b 100644
--- a/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C
+++ b/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C
@@ -60,8 +60,8 @@ void unpack_tsa_cosy2019(TString inFile = "",
std::cout << ">>> unpack_tsa: Initialising..." << std::endl;
CbmMcbm2018UnpackerTaskTof* unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
- CbmMcbm2018UnpackerTaskHodo* unpacker_hodo =
- new CbmMcbm2018UnpackerTaskHodo();
+ CbmCosy2019UnpackerTaskHodo* unpacker_hodo =
+ new CbmCosy2019UnpackerTaskHodo();
unpacker_tof->SetMonitorMode();
unpacker_hodo->SetMonitorMode();
diff --git a/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C b/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C
index c13696f25003a70c254ea4c14959b56e00502c56..07cf77dfcf26a81372b983ef581390b57246cf4f 100644
--- a/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C
+++ b/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C
@@ -61,7 +61,7 @@ void unpack_tsa_cosy2019_sts(TString inFile = "",
CbmMcbm2018UnpackerTaskSts* unpacker_sts = new CbmMcbm2018UnpackerTaskSts();
// CbmMcbm2018UnpackerTaskTof * unpacker_tof = new CbmMcbm2018UnpackerTaskTof();
- // CbmMcbm2018UnpackerTaskHodo * unpacker_hodo = new CbmMcbm2018UnpackerTaskHodo();
+ // CbmCosy2019UnpackerTaskHodo * unpacker_hodo = new CbmCosy2019UnpackerTaskHodo();
unpacker_sts->SetMonitorMode();
// unpacker_tof ->SetMonitorMode();