From f2fccf04e7b8841c664db1ee143ebddc952d8f67 Mon Sep 17 00:00:00 2001
From: Bartosz Sobol <bartosz.sobol@doctoral.uj.edu.pl>
Date: Mon, 3 Feb 2025 03:03:26 +0100
Subject: [PATCH] [PASTA/MUST] rename PASTA to MUST
---
algo/CMakeLists.txt | 10 ++---
algo/base/AuxDigiData.h | 4 +-
algo/base/Definitions.h | 4 +-
algo/base/DigiData.cxx | 12 +++---
algo/base/DigiData.h | 4 +-
algo/data/CMakeLists.txt | 4 +-
.../{pasta => must}/ReadoutConfig.cxx | 6 +--
.../detectors/{pasta => must}/ReadoutConfig.h | 6 +--
algo/detectors/{pasta => must}/Unpack.cxx | 8 ++--
algo/detectors/{pasta => must}/Unpack.h | 6 +--
algo/detectors/{pasta => must}/UnpackMS.cxx | 38 +++++++++----------
algo/detectors/{pasta => must}/UnpackMS.h | 10 ++---
algo/detectors/rich/ReadoutConfig.cxx | 4 +-
algo/global/Reco.cxx | 25 ++++++------
algo/global/Reco.h | 10 ++---
algo/global/RecoResults.h | 2 +-
algo/global/StorableRecoResults.h | 8 ++--
.../{PastaDigiQa.cxx => MustDigiQa.cxx} | 22 +++++------
.../qa/unpack/{PastaDigiQa.h => MustDigiQa.h} | 16 ++++----
core/data/CMakeLists.txt | 8 ++--
core/data/CbmDefs.h | 2 +-
core/data/base/CbmDigiData.h | 12 +++---
.../CbmPastaDigi.cxx => must/CbmMustDigi.cxx} | 2 +-
.../CbmPastaDigi.h => must/CbmMustDigi.h} | 12 +++---
.../CbmMustDigiData.h} | 14 +++----
reco/app/cbmreco/main.cxx | 2 +-
.../rich/mcbm/CbmRichMCbmHitProducer.cxx | 2 +-
27 files changed, 126 insertions(+), 127 deletions(-)
rename algo/detectors/{pasta => must}/ReadoutConfig.cxx (84%)
rename algo/detectors/{pasta => must}/ReadoutConfig.h (89%)
rename algo/detectors/{pasta => must}/Unpack.cxx (80%)
rename algo/detectors/{pasta => must}/Unpack.h (77%)
rename algo/detectors/{pasta => must}/UnpackMS.cxx (91%)
rename algo/detectors/{pasta => must}/UnpackMS.h (97%)
rename algo/qa/unpack/{PastaDigiQa.cxx => MustDigiQa.cxx} (70%)
rename algo/qa/unpack/{PastaDigiQa.h => MustDigiQa.h} (79%)
rename core/data/{pasta/CbmPastaDigi.cxx => must/CbmMustDigi.cxx} (84%)
rename core/data/{pasta/CbmPastaDigi.h => must/CbmMustDigi.h} (71%)
rename core/data/{pasta/CbmPastaDigiData.h => must/CbmMustDigiData.h} (69%)
diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 5aed22a236..b07afd7458 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -143,9 +143,9 @@ set(SRCS
detectors/rich/ReadoutConfig.cxx
detectors/rich/Unpack.cxx
detectors/rich/UnpackMS.cxx
- detectors/pasta/Unpack.cxx
- detectors/pasta/UnpackMS.cxx
- detectors/pasta/ReadoutConfig.cxx
+ detectors/must/Unpack.cxx
+ detectors/must/UnpackMS.cxx
+ detectors/must/ReadoutConfig.cxx
global/ParFiles.cxx
global/StorableRecoResults.cxx
global/Reco.cxx
@@ -162,7 +162,7 @@ set(SRCS
qa/hitfind/BmonHitfindQa.cxx
qa/hitfind/BmonHitfindQaParameters.cxx
qa/unpack/StsDigiQa.cxx
- qa/unpack/PastaDigiQa.cxx
+ qa/unpack/MustDigiQa.cxx
ca/TrackingSetup.cxx
ca/TrackingChain.cxx
ca/qa/CaQa.cxx
@@ -341,7 +341,7 @@ install(DIRECTORY base/gpu TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY data/sts TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/bmon TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/much TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY detectors/pasta TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY detectors/must TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/sts TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/tof TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/trd TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
diff --git a/algo/base/AuxDigiData.h b/algo/base/AuxDigiData.h
index 9fdda66f06..a2bb320161 100644
--- a/algo/base/AuxDigiData.h
+++ b/algo/base/AuxDigiData.h
@@ -12,7 +12,7 @@
#include "CommonUnpacker.h"
#include "bmon/UnpackMS.h"
#include "much/UnpackMS.h"
-#include "pasta/UnpackMS.h"
+#include "must/UnpackMS.h"
#include "rich/UnpackMS.h"
#include "sts/UnpackMS.h"
#include "tof/UnpackMS.h"
@@ -29,7 +29,7 @@ namespace cbm::algo
UnpackAux<bmon::UnpackAuxData> fBmon;
UnpackAux<much::UnpackAuxData> fMuch;
UnpackAux<rich::UnpackAuxData> fRich;
- UnpackAux<pasta::UnpackAuxData> fPasta;
+ UnpackAux<must::UnpackAuxData> fMust;
UnpackAux<sts::UnpackAuxData> fSts;
UnpackAux<tof::UnpackAuxData> fTof;
UnpackAux<trd::UnpackAuxData> fTrd;
diff --git a/algo/base/Definitions.h b/algo/base/Definitions.h
index 3cde44e913..74b2f532bb 100644
--- a/algo/base/Definitions.h
+++ b/algo/base/Definitions.h
@@ -67,7 +67,7 @@ namespace cbm::algo
UnpackMuch,
UnpackTof,
UnpackFsd,
- UnpackPasta,
+ UnpackMust,
EventBuilding,
RecoBmon,
RecoSts,
@@ -140,7 +140,7 @@ CBM_ENUM_DICT(cbm::algo::QaStep,
{"UnpackMuch", cbm::algo::QaStep::UnpackMuch},
{"UnpackTof", cbm::algo::QaStep::UnpackTof},
{"UnpackFsd", cbm::algo::QaStep::UnpackFsd},
- {"UnpackPasta", cbm::algo::QaStep::UnpackPasta},
+ {"UnpackMust", cbm::algo::QaStep::UnpackMust},
{"EventBuilding", cbm::algo::QaStep::EventBuilding},
{"RecoBmon", cbm::algo::QaStep::RecoBmon},
{"RecoSts", cbm::algo::QaStep::RecoSts},
diff --git a/algo/base/DigiData.cxx b/algo/base/DigiData.cxx
index d075119cc5..2277a0dac2 100644
--- a/algo/base/DigiData.cxx
+++ b/algo/base/DigiData.cxx
@@ -21,7 +21,7 @@ DigiData::DigiData(const CbmDigiData& storable)
, fRich(ToPODVector(storable.fRich.fDigis))
, fPsd(ToPODVector(storable.fPsd.fDigis))
, fFsd(ToPODVector(storable.fFsd.fDigis))
- , fPasta(ToPODVector(storable.fPasta.fDigis))
+ , fMust(ToPODVector(storable.fMust.fDigis))
{
}
@@ -37,7 +37,7 @@ size_t DigiData::Size(ECbmModuleId system) const
case ECbmModuleId::kRich: return fRich.size();
case ECbmModuleId::kPsd: return fPsd.size();
case ECbmModuleId::kFsd: return fFsd.size();
- case ECbmModuleId::kPasta: return fPasta.size();
+ case ECbmModuleId::kMust: return fMust.size();
default: throw std::runtime_error("DigiData: Invalid system Id " + ::ToString(system));
}
}
@@ -45,7 +45,7 @@ size_t DigiData::Size(ECbmModuleId system) const
size_t DigiData::TotalSize() const
{
return fSts.size() + fMuch.size() + fTof.size() + fBmon.size() + fTrd.size() + fTrd2d.size() + fRich.size()
- + fPsd.size() + fFsd.size() + fPasta.size();
+ + fPsd.size() + fFsd.size() + fMust.size();
}
size_t DigiData::TotalSizeBytes() const
@@ -53,7 +53,7 @@ size_t DigiData::TotalSizeBytes() const
return sizeof(CbmStsDigi) * fSts.size() + sizeof(CbmMuchDigi) * fMuch.size() + sizeof(CbmTofDigi) * fTof.size()
+ sizeof(CbmBmonDigi) * fBmon.size() + sizeof(CbmTrdDigi) * fTrd.size() + sizeof(CbmTrdDigi) * fTrd2d.size()
+ sizeof(CbmRichDigi) * fRich.size() + sizeof(CbmPsdDigi) * fPsd.size() + sizeof(CbmFsdDigi) * fFsd.size()
- + sizeof(CbmPastaDigi) * fPasta.size();
+ + sizeof(CbmMustDigi) * fMust.size();
}
CbmDigiData DigiData::ToStorable() const
@@ -95,9 +95,9 @@ CbmDigiData DigiData::ToStorable() const
{
.fDigis = ToStdVector(fFsd),
},
- .fPasta =
+ .fMust =
{
- .fDigis = ToStdVector(fPasta),
+ .fDigis = ToStdVector(fMust),
},
};
}
diff --git a/algo/base/DigiData.h b/algo/base/DigiData.h
index 6e8877f21c..9347579634 100644
--- a/algo/base/DigiData.h
+++ b/algo/base/DigiData.h
@@ -10,7 +10,7 @@
#include "CbmEventTriggers.h"
#include "CbmFsdDigi.h"
#include "CbmMuchDigi.h"
-#include "CbmPastaDigi.h"
+#include "CbmMustDigi.h"
#include "CbmPsdDigi.h"
#include "CbmRichDigi.h"
#include "CbmStsDigi.h"
@@ -40,7 +40,7 @@ namespace cbm::algo
PODVector<CbmRichDigi> fRich; ///< Unpacked RICH digis
PODVector<CbmPsdDigi> fPsd; ///< Unpacked PSD digis
PODVector<CbmFsdDigi> fFsd; ///< Unpacked FSD digis
- PODVector<CbmPastaDigi> fPasta; ///< Unpacked PASTA digis
+ PODVector<CbmMustDigi> fMust; ///< Unpacked MUST digis
DigiData();
~DigiData();
diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt
index e65eaba58e..5dd6ae7c12 100644
--- a/algo/data/CMakeLists.txt
+++ b/algo/data/CMakeLists.txt
@@ -32,7 +32,7 @@ set(SRCS
${OFFLINE_DATA_DIR}/fsd/CbmFsdDigi.cxx
${OFFLINE_DATA_DIR}/fsd/CbmFsdAddress.cxx
- ${OFFLINE_DATA_DIR}/pasta/CbmPastaDigi.cxx
+ ${OFFLINE_DATA_DIR}/must/CbmMustDigi.cxx
${OFFLINE_DATA_DIR}/raw/CriGet4Mess001.cxx
${OFFLINE_DATA_DIR}/raw/StsXyterMessage.cxx
@@ -51,7 +51,7 @@ target_include_directories(OnlineData
PUBLIC ${OFFLINE_DATA_DIR}/tof
PUBLIC ${OFFLINE_DATA_DIR}/psd
PUBLIC ${OFFLINE_DATA_DIR}/fsd
- PUBLIC ${OFFLINE_DATA_DIR}/pasta
+ PUBLIC ${OFFLINE_DATA_DIR}/must
PUBLIC ${OFFLINE_DATA_DIR}/global
PUBLIC ${OFFLINE_DATA_DIR}/raw
)
diff --git a/algo/detectors/pasta/ReadoutConfig.cxx b/algo/detectors/must/ReadoutConfig.cxx
similarity index 84%
rename from algo/detectors/pasta/ReadoutConfig.cxx
rename to algo/detectors/must/ReadoutConfig.cxx
index 4c1aaea395..190d06c53f 100644
--- a/algo/detectors/pasta/ReadoutConfig.cxx
+++ b/algo/detectors/must/ReadoutConfig.cxx
@@ -6,9 +6,9 @@
namespace cbm::algo
{
- CBM_YAML_INSTANTIATE(pasta::ReadoutConfig);
+ CBM_YAML_INSTANTIATE(must::ReadoutConfig);
- namespace pasta
+ namespace must
{
const std::vector<uint16_t>& ReadoutConfig::GetEquipmentIds() const { return fEquipmentIds; }
@@ -17,6 +17,6 @@ namespace cbm::algo
uint8_t ReadoutConfig::GetSystemVersion() const { return fSystemVersion; }
- } // namespace pasta
+ } // namespace must
} // namespace cbm::algo
diff --git a/algo/detectors/pasta/ReadoutConfig.h b/algo/detectors/must/ReadoutConfig.h
similarity index 89%
rename from algo/detectors/pasta/ReadoutConfig.h
rename to algo/detectors/must/ReadoutConfig.h
index 74c56caae1..7e99cfe5a0 100644
--- a/algo/detectors/pasta/ReadoutConfig.h
+++ b/algo/detectors/must/ReadoutConfig.h
@@ -10,7 +10,7 @@
#include <array>
#include <cstdint>
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
class ReadoutConfig {
@@ -33,6 +33,6 @@ namespace cbm::algo::pasta
yaml::Property(&ReadoutConfig::fSystemVersion, "systemVersion", "System version"));
};
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
-CBM_YAML_EXTERN_DECL(cbm::algo::pasta::ReadoutConfig);
+CBM_YAML_EXTERN_DECL(cbm::algo::must::ReadoutConfig);
diff --git a/algo/detectors/pasta/Unpack.cxx b/algo/detectors/must/Unpack.cxx
similarity index 80%
rename from algo/detectors/pasta/Unpack.cxx
rename to algo/detectors/must/Unpack.cxx
index d80af3cc5e..bf81676b13 100644
--- a/algo/detectors/pasta/Unpack.cxx
+++ b/algo/detectors/must/Unpack.cxx
@@ -7,7 +7,7 @@
#include "AlgoFairloggerCompat.h"
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
Unpack::Unpack(const ReadoutConfig& readout) : fReadout(readout)
{
@@ -16,12 +16,12 @@ namespace cbm::algo::pasta
for (const auto eqId : fReadout.GetEquipmentIds()) {
fAlgos.emplace(UnpackKey{eqId, fReadout.GetSystemVersion()}, std::make_unique<UnpackMS>(unpackPar));
- L_(info) << "--- Configured equipment " << eqId << " of PASTA@RICH.";
+ L_(info) << "--- Configured equipment " << eqId << " of MUST@RICH.";
}
- L_(info) << "--- Configured " << fAlgos.size() << " unpacker algorithms for PASTA@RICH.";
+ L_(info) << "--- Configured " << fAlgos.size() << " unpacker algorithms for MUST@RICH.";
}
Unpack::Result_t Unpack::operator()(const fles::Timeslice& ts) const { return DoUnpack(fles::Subsystem::RICH, ts); }
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
diff --git a/algo/detectors/pasta/Unpack.h b/algo/detectors/must/Unpack.h
similarity index 77%
rename from algo/detectors/pasta/Unpack.h
rename to algo/detectors/must/Unpack.h
index e3f5f626be..d98c8a77c0 100644
--- a/algo/detectors/pasta/Unpack.h
+++ b/algo/detectors/must/Unpack.h
@@ -8,12 +8,12 @@
#include "ReadoutConfig.h"
#include "UnpackMS.h"
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
namespace detail
{
- using UnpackBase = CommonUnpacker<CbmPastaDigi, UnpackMonitorData, UnpackAuxData>;
+ using UnpackBase = CommonUnpacker<CbmMustDigi, UnpackMonitorData, UnpackAuxData>;
}
class Unpack : public detail::UnpackBase {
@@ -28,4 +28,4 @@ namespace cbm::algo::pasta
ReadoutConfig fReadout;
};
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
diff --git a/algo/detectors/pasta/UnpackMS.cxx b/algo/detectors/must/UnpackMS.cxx
similarity index 91%
rename from algo/detectors/pasta/UnpackMS.cxx
rename to algo/detectors/must/UnpackMS.cxx
index 2366e69e02..81f90bae22 100644
--- a/algo/detectors/pasta/UnpackMS.cxx
+++ b/algo/detectors/must/UnpackMS.cxx
@@ -8,7 +8,7 @@
#include <cstdint>
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
UnpackMS::UnpackMS(const UnpackPar& pars) : fParams(pars) {}
@@ -24,7 +24,7 @@ namespace cbm::algo::pasta
ctx.cbmTimeMS = 0;
ctx.digis.reserve(msDescr.size / sizeof(u32));
- pasta::MicrosliceReader reader;
+ must::MicrosliceReader reader;
reader.SetData(msContent, msDescr.size);
const auto mstime = msDescr.idx;
@@ -50,7 +50,7 @@ namespace cbm::algo::pasta
}
- void UnpackMS::ProcessTrbPacket(pasta::MicrosliceReader& reader, MSContext& ctx) const
+ void UnpackMS::ProcessTrbPacket(must::MicrosliceReader& reader, MSContext& ctx) const
{
//process CBM time
const uint32_t word_MSB = reader.NextWord(); // CBM 63:32
@@ -80,7 +80,7 @@ namespace cbm::algo::pasta
}
- void UnpackMS::ProcessHubBlock(pasta::MicrosliceReader& reader, MSContext& ctx) const
+ void UnpackMS::ProcessHubBlock(must::MicrosliceReader& reader, MSContext& ctx) const
{
uint32_t word = reader.NextWord();
@@ -135,7 +135,7 @@ namespace cbm::algo::pasta
}
}
- int UnpackMS::ProcessCtsHeader(pasta::MicrosliceReader& reader, uint32_t subSubEventSize,
+ int UnpackMS::ProcessCtsHeader(must::MicrosliceReader& reader, uint32_t subSubEventSize,
uint32_t /*subSubEventId*/) const
{
const uint32_t word = reader.NextWord();
@@ -163,7 +163,7 @@ namespace cbm::algo::pasta
return nofTimeWords;
}
- void UnpackMS::ProcessSubSubEvent(pasta::MicrosliceReader& reader, int nofTimeWords, uint32_t subSubEventId,
+ void UnpackMS::ProcessSubSubEvent(must::MicrosliceReader& reader, int nofTimeWords, uint32_t subSubEventId,
MSContext& ctx) const
{
bool wasHeader = false;
@@ -185,7 +185,7 @@ namespace cbm::algo::pasta
return;
}
- // Skip SubSubEvent for CTS and not PASTA addresses
+ // Skip SubSubEvent for CTS and not MUST addresses
if (std::find(fParams.fTRBAddresses.cbegin(), fParams.fTRBAddresses.cend(), subSubEventId)
== fParams.fTRBAddresses.end()) {
ctx.monitor.fNumCtsAndUnmappedDirich++;
@@ -210,7 +210,7 @@ namespace cbm::algo::pasta
// First word is expected to be of type "header"
if (GetTdcWordType(reader.NextWord()) != TdcWordType::Header) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": 1st message is not a TDC Header, skipping subsubevent";
ctx.monitor.fNumErrInvalidFirstMessage++;
ctx.monitor.fNumSkippedSubsubevent++;
@@ -226,7 +226,7 @@ namespace cbm::algo::pasta
// Second word is expected to be of type "epoch"
uint32_t word = reader.NextWord();
if (GetTdcWordType(word) != TdcWordType::Epoch) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": 2nd message is not an epoch, skipping subsubevent";
ctx.monitor.fNumErrInvalidSecondMessage++;
ctx.monitor.fNumSkippedSubsubevent++;
@@ -248,7 +248,7 @@ namespace cbm::algo::pasta
switch (GetTdcWordType(word)) {
case TdcWordType::TimeData: {
if (!wasHeader || !wasEpoch || wasTrailer) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": illegal position of TDC Time (before header/epoch or after trailer)";
ctx.monitor.fNumErrWildTdcTime++;
ctx.monitor.fNumSkippedSubsubevent++;
@@ -265,7 +265,7 @@ namespace cbm::algo::pasta
}
case TdcWordType::Epoch: {
if (!wasHeader || wasTrailer) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": illegal position of TDC Epoch (before header or after trailer)";
ctx.monitor.fNumErrWildEpoch++;
ctx.monitor.fNumSkippedSubsubevent++;
@@ -280,7 +280,7 @@ namespace cbm::algo::pasta
}
case TdcWordType::Header: {
if (wasEpoch || wasTime || wasTrailer) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": illegal position of TDC Header (after time/epoch/trailer)";
ctx.monitor.fNumErrWildHeaderMessage++;
ctx.monitor.fNumSkippedSubsubevent++;
@@ -294,7 +294,7 @@ namespace cbm::algo::pasta
}
case TdcWordType::Trailer: {
if (!wasEpoch || !wasTime || !wasHeader) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": illegal position of TDC Trailer (before time/epoch/header)";
ctx.monitor.fNumErrWildTrailerMessage++;
ctx.monitor.fNumSkippedSubsubevent++;
@@ -303,7 +303,7 @@ namespace cbm::algo::pasta
}
return;
}
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec << ": TDC Trailer too early, "
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec << ": TDC Trailer too early, "
<< (nofTimeWords - 1 - i) << " word(s) before last";
ctx.monitor.fNumErrWildTrailerMessage++;
wasTrailer = true;
@@ -324,17 +324,17 @@ namespace cbm::algo::pasta
// Last word is expected to be of type "trailer"
word = reader.NextWord();
if (GetTdcWordType(word) != TdcWordType::Trailer) {
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec << ": Last word not a TDC trailer";
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec << ": Last word not a TDC trailer";
ctx.monitor.fNumErrInvalidLastMessage++;
if (GetTdcWordType(word) == TdcWordType::TimeData && !wasTrailer) {
if (ProcessTimeDataWord(epoch, word, subSubEventId, raisingTime, ctx)) {
ctx.monitor.fNumWarnRecoveredLastDigi++;
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": Rescuing TimeData in subsubevent with missing Trailer leading to saved Digi";
}
else {
ctx.monitor.fNumErrOrphanRecovTimeData++;
- L_(debug) << "PASTA DiRICH 0x" << std::hex << subSubEventId << std::dec
+ L_(debug) << "MUST DiRICH 0x" << std::hex << subSubEventId << std::dec
<< ": Rescuing TimeData in subsubevent with missing Trailer w/o extra digi";
}
}
@@ -370,7 +370,7 @@ namespace cbm::algo::pasta
if (ToT >= fToTMin && ToT <= fToTMax) {
if (fullTimeCorr >= 0.0) {
WriteOutputDigi(subSubEventId, td.fChannel, raisingTime[td.fChannel], ToT, ctx);
- L_(info) << "[PASTA DIGI] "
+ L_(info) << "[MUST DIGI] "
<< "TRBId: 0x" << std::hex << subSubEventId << std::dec << "; channel: 0x" << std::hex
<< td.fChannel << std::dec << "; raising time: " << raisingTime[td.fChannel] << "; ToT: " << ToT;
madeDigi = true;
@@ -452,4 +452,4 @@ namespace cbm::algo::pasta
uint16_t UnpackMS::ProcessTrailer(uint32_t tdcWord) const { return static_cast<uint16_t>(tdcWord & 0xffff); }
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
diff --git a/algo/detectors/pasta/UnpackMS.h b/algo/detectors/must/UnpackMS.h
similarity index 97%
rename from algo/detectors/pasta/UnpackMS.h
rename to algo/detectors/must/UnpackMS.h
index faf4ad6d5e..229f499824 100644
--- a/algo/detectors/pasta/UnpackMS.h
+++ b/algo/detectors/must/UnpackMS.h
@@ -4,7 +4,7 @@
#pragma once
-#include "CbmPastaDigi.h"
+#include "CbmMustDigi.h"
#include "Definitions.h"
#include "ReadoutConfig.h"
#include "Timeslice.hpp"
@@ -17,7 +17,7 @@
#include <sstream>
#include <utility>
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
class MicrosliceReader;
@@ -116,7 +116,7 @@ namespace cbm::algo::pasta
///// TO BE FILLED
};
- class UnpackMS : public UnpackMSBase<CbmPastaDigi, UnpackMonitorData, UnpackAuxData> {
+ class UnpackMS : public UnpackMSBase<CbmMustDigi, UnpackMonitorData, UnpackAuxData> {
public:
UnpackMS() = delete;
@@ -161,7 +161,7 @@ namespace cbm::algo::pasta
uint16_t currentSubSubEvent = 0;
- std::vector<CbmPastaDigi> digis;
+ std::vector<CbmMustDigi> digis;
UnpackMonitorData monitor;
};
@@ -270,4 +270,4 @@ namespace cbm::algo::pasta
}
};
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
diff --git a/algo/detectors/rich/ReadoutConfig.cxx b/algo/detectors/rich/ReadoutConfig.cxx
index 78099eeeda..fb8db23657 100644
--- a/algo/detectors/rich/ReadoutConfig.cxx
+++ b/algo/detectors/rich/ReadoutConfig.cxx
@@ -65,7 +65,7 @@ namespace cbm::algo::rich
// Constants
const uint16_t numComp = 1; // Number of components
- const uint16_t numElinksPerComp = 79; // Number of elinks per component (74 mRICH, 5 FSD/NCAL, 8 PASTA)
+ const uint16_t numElinksPerComp = 79; // Number of elinks per component (74 mRICH, 5 FSD/NCAL, 8 MUST)
const uint16_t numChanPerElink = 33; // Number of channels per Elink
// Equipment IDs for each component
@@ -83,7 +83,7 @@ namespace cbm::algo::rich
0x7320, 0x7321, 0x7330, 0x7331, 0x7340, 0x7341, 0x7350, 0x7351, 0x7360, 0x7361, 0x7370, 0x7371,
0x7380, 0x7381, 0x7901, 0x7902, 0x7903, 0x7904, 0x7905 /*, 0x9991, 0x9992, 0x9993, 0x9994, 0x9995, 0x9996, 0x9997, 0x9998*/};
// TRBaddresses 0x7901 and 0x7902 are for FSD/NCAL
- // TRBaddresses 0x9991 to 0x9998 are for PASTA
+ // TRBaddresses 0x9991 to 0x9998 are for MUST
double ToTshifts[numElinksPerComp][numChanPerElink] = {
{0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
diff --git a/algo/global/Reco.cxx b/algo/global/Reco.cxx
index 16f5e31dd3..c2f4bbca2d 100644
--- a/algo/global/Reco.cxx
+++ b/algo/global/Reco.cxx
@@ -10,8 +10,8 @@
#include "EventbuildChain.h"
#include "Exceptions.h"
#include "HistogramSender.h"
+#include "MustDigiQa.h"
#include "ParFiles.h"
-#include "PastaDigiQa.h"
#include "RecoGeneralQa.h"
#include "StsDigiQa.h"
#include "TrackingSetup.h"
@@ -25,10 +25,10 @@
#include "evbuild/Config.h"
#include "kfp/KfpV0FinderChain.h"
#include "much/Unpack.h"
+#include "must/Unpack.h"
#include "qa/QaManager.h"
#include "qa/hitfind/BmonHitfindQa.h"
#include "rich/Unpack.h"
-#include "pasta/Unpack.h"
#include "sts/ChannelMaskSet.h"
#include "sts/HitfinderChain.h"
#include "sts/Unpack.h"
@@ -146,12 +146,11 @@ void Reco::Init(const Options& opts)
fRichUnpack = std::make_unique<rich::Unpack>(richCfg);
//TODO handle under fles::Subsystem::MUST when available
- pasta::ReadoutConfig pastaCfg =
- yaml::ReadFromFile<pasta::ReadoutConfig>(Opts().ParamsDir() / parFiles.must.readout);
- fPastaUnpack = std::make_unique<pasta::Unpack>(pastaCfg);
- if (fSender != nullptr && Opts().Has(QaStep::UnpackPasta)) {
- fPastaDigiQa = std::make_unique<pasta::DigiQa>(fSender, pastaCfg);
- fPastaDigiQa->Init();
+ must::ReadoutConfig mustCfg = yaml::ReadFromFile<must::ReadoutConfig>(Opts().ParamsDir() / parFiles.must.readout);
+ fMustUnpack = std::make_unique<must::Unpack>(mustCfg);
+ if (fSender != nullptr && Opts().Has(QaStep::UnpackMust)) {
+ fMustDigiQa = std::make_unique<must::DigiQa>(fSender, mustCfg);
+ fMustDigiQa->Init();
}
}
@@ -331,7 +330,7 @@ RecoResults Reco::Run(const fles::Timeslice& ts)
std::tie(digis.fBmon, auxDigis.fBmon) = RunUnpacker(fBmonUnpack, ts);
std::tie(digis.fMuch, auxDigis.fMuch) = RunUnpacker(fMuchUnpack, ts);
std::tie(digis.fRich, auxDigis.fRich) = RunUnpacker(fRichUnpack, ts);
- std::tie(digis.fPasta, auxDigis.fPasta) = RunUnpacker(fPastaUnpack, ts);
+ std::tie(digis.fMust, auxDigis.fMust) = RunUnpacker(fMustUnpack, ts);
std::tie(digis.fSts, auxDigis.fSts) = RunUnpacker(fStsUnpack, ts);
std::tie(digis.fTof, auxDigis.fTof) = RunUnpacker(fTofUnpack, ts);
std::tie(digis.fTrd, auxDigis.fTrd) = RunUnpacker(fTrdUnpack, ts);
@@ -344,11 +343,11 @@ RecoResults Reco::Run(const fles::Timeslice& ts)
L_(info) << "TS contains Digis: STS=" << digis.fSts.size() << " MUCH=" << digis.fMuch.size()
<< " TOF=" << digis.fTof.size() << " BMON=" << digis.fBmon.size() << " TRD=" << digis.fTrd.size()
<< " TRD2D=" << digis.fTrd2d.size() << " RICH=" << digis.fRich.size() << " PSD=" << digis.fPsd.size()
- << " FSD=" << digis.fFsd.size() << " PASTA=" << digis.fPasta.size();
+ << " FSD=" << digis.fFsd.size() << " MUST=" << digis.fMust.size();
// --- Raw digi QAs
- if (fSender != nullptr && Opts().Has(QaStep::UnpackPasta)) {
- fPastaDigiQa->Exec(digis.fPasta, ts.index());
+ if (fSender != nullptr && Opts().Has(QaStep::UnpackMust)) {
+ fMustDigiQa->Exec(digis.fMust, ts.index());
}
if (fSender != nullptr && Opts().Has(Subsystem::STS)) {
@@ -461,7 +460,7 @@ RecoResults Reco::Run(const fles::Timeslice& ts)
results.trdDigis = std::move(digis.fTrd);
results.tofDigis = std::move(digis.fTof);
results.richDigis = std::move(digis.fRich);
- results.pastaDigis = std::move(digis.fPasta);
+ results.mustDigis = std::move(digis.fMust);
}
if (Opts().HasOutput(RecoData::Track)) {
results.tracks = std::move(recoData.tracks);
diff --git a/algo/global/Reco.h b/algo/global/Reco.h
index 7f763c7855..ad2a272d2e 100644
--- a/algo/global/Reco.h
+++ b/algo/global/Reco.h
@@ -46,11 +46,11 @@ namespace cbm::algo
class Unpack;
}
- namespace pasta
+ namespace must
{
class Unpack;
class DigiQa;
- } // namespace pasta
+ } // namespace must
namespace sts
{
@@ -172,9 +172,9 @@ namespace cbm::algo
// RICH
std::unique_ptr<rich::Unpack> fRichUnpack;
- // PASTA
- std::unique_ptr<pasta::Unpack> fPastaUnpack;
- std::unique_ptr<pasta::DigiQa> fPastaDigiQa; ///< Raw PASTA-digis QA
+ // MUST
+ std::unique_ptr<must::Unpack> fMustUnpack;
+ std::unique_ptr<must::DigiQa> fMustDigiQa; ///< Raw MUST-digis QA
// STS
std::unique_ptr<sts::Unpack> fStsUnpack;
diff --git a/algo/global/RecoResults.h b/algo/global/RecoResults.h
index ee0bd49c78..4a0cf6574d 100644
--- a/algo/global/RecoResults.h
+++ b/algo/global/RecoResults.h
@@ -36,7 +36,7 @@ namespace cbm::algo
PODVector<CbmTrdDigi> trdDigis;
PODVector<CbmTofDigi> tofDigis;
PODVector<CbmRichDigi> richDigis;
- PODVector<CbmPastaDigi> pastaDigis;
+ PODVector<CbmMustDigi> mustDigis;
std::vector<DigiEvent> events;
diff --git a/algo/global/StorableRecoResults.h b/algo/global/StorableRecoResults.h
index ae911f774f..31e08876a9 100644
--- a/algo/global/StorableRecoResults.h
+++ b/algo/global/StorableRecoResults.h
@@ -70,8 +70,8 @@ namespace cbm::algo
std::vector<CbmRichDigi>& RichDigis() { return fRichDigis; }
const std::vector<CbmRichDigi>& RichDigis() const { return fRichDigis; }
- std::vector<CbmPastaDigi>& PastaDigis() { return fPastaDigis; }
- const std::vector<CbmPastaDigi>& PastaDigis() const { return fPastaDigis; }
+ std::vector<CbmMustDigi>& MustDigis() { return fMustDigis; }
+ const std::vector<CbmMustDigi>& MustDigis() const { return fMustDigis; }
std::vector<CbmDigiEvent>& DigiEvents() { return fDigiEvents; }
const std::vector<CbmDigiEvent>& DigiEvents() const { return fDigiEvents; }
@@ -109,7 +109,7 @@ namespace cbm::algo
std::vector<CbmTrdDigi> fTrdDigis;
std::vector<CbmTofDigi> fTofDigis;
std::vector<CbmRichDigi> fRichDigis;
- std::vector<CbmPastaDigi> fPastaDigis;
+ std::vector<CbmMustDigi> fMustDigis;
// Event builder/filter output
std::vector<CbmDigiEvent> fDigiEvents;
@@ -146,7 +146,7 @@ namespace cbm::algo
ar& fTrdDigis;
ar& fTofDigis;
ar& fRichDigis;
- ar& fPastaDigis;
+ ar& fMustDigis;
ar& fDigiEvents;
diff --git a/algo/qa/unpack/PastaDigiQa.cxx b/algo/qa/unpack/MustDigiQa.cxx
similarity index 70%
rename from algo/qa/unpack/PastaDigiQa.cxx
rename to algo/qa/unpack/MustDigiQa.cxx
index 125e1b9c0a..efedc14377 100644
--- a/algo/qa/unpack/PastaDigiQa.cxx
+++ b/algo/qa/unpack/MustDigiQa.cxx
@@ -2,14 +2,14 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Bartosz Sobol [committer] */
-#include "PastaDigiQa.h"
+#include "MustDigiQa.h"
#include <fmt/format.h>
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
DigiQa::DigiQa(std::shared_ptr<HistogramSender> pSender, const ReadoutConfig& readoutConfig)
- : fQaData{"RawDigi/PASTA"}
+ : fQaData{"RawDigi/MUST"}
, fpSender{pSender}
, fReadoutConfig(readoutConfig)
{
@@ -24,17 +24,17 @@ namespace cbm::algo::pasta
for (auto iTRB = 0; iTRB < fReadoutConfig.GetTrbAddresses().size(); ++iTRB) {
const auto TRBId = fReadoutConfig.GetTrbAddresses().at(iTRB);
- auto canvas = qa::CanvasConfig(fmt::format("pasta_digi/pasta_digi_vs_channel_tot_{:x}", TRBId),
- fmt::format("PASTA digis per channel and ToT for TRB 0x{:x}", TRBId), 2, 1);
+ auto canvas = qa::CanvasConfig(fmt::format("must_digi/must_digi_vs_channel_tot_{:x}", TRBId),
+ fmt::format("MUST digis per channel and ToT for TRB 0x{:x}", TRBId), 2, 1);
fChannelHists.emplace_back(fQaData.MakeObj<qa::H1D>(
- fmt::format("pasta_digi_{:x}_channel", TRBId),
+ fmt::format("must_digi_{:x}_channel", TRBId),
fmt::format("Digis per channel for TRB 0x{:x};channel;N_{{digis}}", TRBId), 32, 0, 32));
auto padChannels = qa::PadConfig();
padChannels.RegisterHistogram(fChannelHists[iTRB], "hist");
canvas.AddPadConfig(padChannels);
- fTotHists.emplace_back(fQaData.MakeObj<qa::H1D>(fmt::format("pasta_digi_{:x}_tot", TRBId),
+ fTotHists.emplace_back(fQaData.MakeObj<qa::H1D>(fmt::format("must_digi_{:x}_tot", TRBId),
fmt::format("ToT for TRB 0x{:x};ToT;N_{{digis}}", TRBId), 20, 30,
50));
auto padTot = qa::PadConfig();
@@ -47,7 +47,7 @@ namespace cbm::algo::pasta
fQaData.Init(fpSender);
}
- void DigiQa::Exec(const PODVector<CbmPastaDigi>& digis, const uint64_t tsIndex)
+ void DigiQa::Exec(const PODVector<CbmMustDigi>& digis, const uint64_t tsIndex)
{
if (fpSender == nullptr) {
return;
@@ -59,7 +59,7 @@ namespace cbm::algo::pasta
const auto iHist = digi.fTRBId - fReadoutConfig.GetTrbAddresses()[0];
if (iHist >= fChannelHists.size()) {
- L_(error) << fmt::format("pasta::DigiQa: digi TRBId {:x} out of range", digi.fTRBId);
+ L_(error) << fmt::format("must::DigiQa: digi TRBId {:x} out of range", digi.fTRBId);
continue;
}
@@ -70,6 +70,6 @@ namespace cbm::algo::pasta
fQaData.Send(fpSender);
}
- void DigiQa::operator()(const PODVector<CbmPastaDigi>& digis, const uint64_t tsIndex) { Exec(digis, tsIndex); }
+ void DigiQa::operator()(const PODVector<CbmMustDigi>& digis, const uint64_t tsIndex) { Exec(digis, tsIndex); }
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
diff --git a/algo/qa/unpack/PastaDigiQa.h b/algo/qa/unpack/MustDigiQa.h
similarity index 79%
rename from algo/qa/unpack/PastaDigiQa.h
rename to algo/qa/unpack/MustDigiQa.h
index fe671f8069..3ef02e1ef0 100644
--- a/algo/qa/unpack/PastaDigiQa.h
+++ b/algo/qa/unpack/MustDigiQa.h
@@ -4,20 +4,20 @@
#pragma once
-#include "CbmPastaDigi.h"
+#include "CbmMustDigi.h"
#include "QaBase.h"
#include <CommonUnpacker.h>
-#include <pasta/ReadoutConfig.h>
+#include <must/ReadoutConfig.h>
-namespace cbm::algo::pasta
+namespace cbm::algo::must
{
/* TODO probably cbm::algo::sts::QaBase can be used here as a base class, but for some reason it is in sts namespace.
* IMO it should be only in cbm::algo and be a base for all QA classes?
* For now I'm doing similar impl/interface, but without inheritance.
*/
- /// \class cbm::algo::pasta::DigiQa
- /// \brief QA module for PASTA raw digis
+ /// \class cbm::algo::must::DigiQa
+ /// \brief QA module for MUST raw digis
class DigiQa {
public:
/// \brief Main constructor with HistogramSender
@@ -37,10 +37,10 @@ namespace cbm::algo::pasta
void Init();
/// \brief Executes QA (filling histograms)
- void Exec(const PODVector<CbmPastaDigi>& digis, uint64_t tsIndex);
+ void Exec(const PODVector<CbmMustDigi>& digis, uint64_t tsIndex);
/// \brief Executes QA (filling histograms), see Exec()
- void operator()(const PODVector<CbmPastaDigi>& digis, uint64_t tsIndex);
+ void operator()(const PODVector<CbmMustDigi>& digis, uint64_t tsIndex);
private:
std::vector<qa::H1D*> fChannelHists{}; ///< histograms: nDigis per channel per TRB
@@ -51,4 +51,4 @@ namespace cbm::algo::pasta
ReadoutConfig fReadoutConfig;
};
-} // namespace cbm::algo::pasta
+} // namespace cbm::algo::must
diff --git a/core/data/CMakeLists.txt b/core/data/CMakeLists.txt
index 3cc9465592..4c5f8f974d 100644
--- a/core/data/CMakeLists.txt
+++ b/core/data/CMakeLists.txt
@@ -15,7 +15,7 @@ set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}/rich
${CMAKE_CURRENT_SOURCE_DIR}/psd
${CMAKE_CURRENT_SOURCE_DIR}/fsd
- ${CMAKE_CURRENT_SOURCE_DIR}/pasta
+ ${CMAKE_CURRENT_SOURCE_DIR}/must
${CMAKE_CURRENT_SOURCE_DIR}/global
)
@@ -67,7 +67,7 @@ set(SRCS
rich/CbmRichTrbDigi.cxx
rich/CbmRichDigi.cxx
- pasta/CbmPastaDigi.cxx
+ must/CbmMustDigi.cxx
much/CbmMuchPixelHit.cxx
much/CbmMuchPoint.cxx
@@ -137,7 +137,7 @@ SET_SOURCE_FILES_PROPERTIES(tof/etof/star_rhicf.c PROPERTIES COMPILE_FLAGS -Wno-
list(APPEND HEADERS base/CbmDigiData.h global/CbmDigiEvent.h global/CbmDigiTimeslice.h
-bmon/CbmBmonDigiData.h sts/CbmStsDigiData.h much/CbmMuchDigiData.h rich/CbmRichDigiData.h pasta/CbmPastaDigiData.h
+bmon/CbmBmonDigiData.h sts/CbmStsDigiData.h much/CbmMuchDigiData.h rich/CbmRichDigiData.h must/CbmMustDigiData.h
trd/CbmTrdDigiData.h tof/CbmTofDigiData.h psd/CbmPsdDigiData.h fsd/CbmFsdDigiData.h trd/CbmTrdFexMessageSpadic.h)
set(LIBRARY_NAME CbmData)
@@ -169,7 +169,7 @@ Install(FILES
psd/CbmPsdDigiData.h
fsd/CbmFsdDigiData.h
rich/CbmRichDigiData.h rich/CbmRichRingLight.h
- pasta/CbmPastaDigiData.h
+ must/CbmMustDigiData.h
sts/CbmStsDigiData.h
trd/CbmTrdDigiData.h
tof/CbmTofDigiData.h
diff --git a/core/data/CbmDefs.h b/core/data/CbmDefs.h
index 4e0471d999..59b25b5191 100644
--- a/core/data/CbmDefs.h
+++ b/core/data/CbmDefs.h
@@ -61,7 +61,7 @@ enum class ECbmModuleId
kCave = 22, ///< Cave
kLastModule = 23, ///< For loops over all modules
kNotExist = -1, ///< If not found
- kPasta = 100 ///< PANDA Straws //TODO
+ kMust = 100 ///< PANDA Straws //TODO
};
// operator ++ for ECbmModuleId for convenient usage in loops
diff --git a/core/data/base/CbmDigiData.h b/core/data/base/CbmDigiData.h
index 8317e3971c..efae0b8cb9 100644
--- a/core/data/base/CbmDigiData.h
+++ b/core/data/base/CbmDigiData.h
@@ -9,7 +9,7 @@
#include "CbmBmonDigiData.h"
#include "CbmFsdDigiData.h"
#include "CbmMuchDigiData.h"
-#include "CbmPastaDigiData.h"
+#include "CbmMustDigiData.h"
#include "CbmPsdDigiData.h"
#include "CbmRichDigiData.h"
#include "CbmStsDigiData.h"
@@ -42,7 +42,7 @@ class CbmDigiData {
CbmTofDigiData fTof; ///< TOF data
CbmPsdDigiData fPsd; ///< PSD data
CbmFsdDigiData fFsd; ///< FSD data
- CbmPastaDigiData fPasta; ///< PASTA data
+ CbmMustDigiData fMust; ///< MUST data
friend class boost::serialization::access;
/** @brief BOOST serializer**/
@@ -59,7 +59,7 @@ class CbmDigiData {
ar& fPsd;
ar& fFsd;
ar& fRich;
- ar& fPasta;
+ ar& fMust;
}
// --- ROOT serializer
@@ -79,7 +79,7 @@ class CbmDigiData {
fPsd.Clear();
fFsd.Clear();
fRich.Clear();
- fPasta.Clear();
+ fMust.Clear();
}
/** @brief Size of detector data **/
@@ -95,7 +95,7 @@ class CbmDigiData {
case ECbmModuleId::kPsd: return fPsd.Size(); break;
case ECbmModuleId::kRich: return fRich.Size(); break;
case ECbmModuleId::kFsd: return fFsd.Size(); break;
- case ECbmModuleId::kPasta: return fPasta.Size(); break;
+ case ECbmModuleId::kMust: return fMust.Size(); break;
default: return 0; break;
}
}
@@ -113,7 +113,7 @@ class CbmDigiData {
size += fPsd.Size() * sizeof(CbmPsdDigi);
size += fFsd.Size() * sizeof(CbmFsdDigi);
size += fRich.Size() * sizeof(CbmRichDigi);
- size += fPasta.Size() * sizeof(CbmPastaDigi);
+ size += fMust.Size() * sizeof(CbmMustDigi);
return size;
}
};
diff --git a/core/data/pasta/CbmPastaDigi.cxx b/core/data/must/CbmMustDigi.cxx
similarity index 84%
rename from core/data/pasta/CbmPastaDigi.cxx
rename to core/data/must/CbmMustDigi.cxx
index 445f9a6df6..2f8332a413 100644
--- a/core/data/pasta/CbmPastaDigi.cxx
+++ b/core/data/must/CbmMustDigi.cxx
@@ -2,4 +2,4 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Bartosz Sobol [committer] */
-#include "CbmPastaDigi.h"
+#include "CbmMustDigi.h"
diff --git a/core/data/pasta/CbmPastaDigi.h b/core/data/must/CbmMustDigi.h
similarity index 71%
rename from core/data/pasta/CbmPastaDigi.h
rename to core/data/must/CbmMustDigi.h
index 2b0d841627..b25c335ad2 100644
--- a/core/data/pasta/CbmPastaDigi.h
+++ b/core/data/must/CbmMustDigi.h
@@ -2,16 +2,16 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Bartosz Sobol [committer] */
-#ifndef CBMPASTADIGI_H
-#define CBMPASTADIGI_H
+#ifndef CBMMUSTDIGI_H
+#define CBMMUSTDIGI_H
#include <cstdint>
-class CbmPastaDigi {
+class CbmMustDigi {
public:
- CbmPastaDigi() = default;
+ CbmMustDigi() = default;
- CbmPastaDigi(const uint32_t trbId, const uint32_t channel, const double time, const double tot)
+ CbmMustDigi(const uint32_t trbId, const uint32_t channel, const double time, const double tot)
: fTRBId{trbId}
, fChannel{channel}
, fTime{time}
@@ -37,4 +37,4 @@ class CbmPastaDigi {
};
-#endif //CBMPASTADIGI_H
+#endif //CBMMUSTDIGI_H
diff --git a/core/data/pasta/CbmPastaDigiData.h b/core/data/must/CbmMustDigiData.h
similarity index 69%
rename from core/data/pasta/CbmPastaDigiData.h
rename to core/data/must/CbmMustDigiData.h
index b788bc99b4..39b8f8267a 100644
--- a/core/data/pasta/CbmPastaDigiData.h
+++ b/core/data/must/CbmMustDigiData.h
@@ -2,10 +2,10 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Bartosz Sobol [committer] */
-#ifndef CBMPASTADIGIDATA_H
-#define CBMPASTADIGIDATA_H
+#ifndef CBMMUSTDIGIDATA_H
+#define CBMMUSTDIGIDATA_H
-#include "CbmPastaDigi.h"
+#include "CbmMustDigi.h"
#ifndef NO_ROOT
#include <Rtypes.h> // for ClassDef
@@ -13,9 +13,9 @@
#include <boost/serialization/vector.hpp>
-class CbmPastaDigiData {
+class CbmMustDigiData {
public:
- std::vector<CbmPastaDigi> fDigis{};
+ std::vector<CbmMustDigi> fDigis{};
template<class Archive>
void serialize(Archive& ar, const unsigned int /*version*/)
@@ -28,8 +28,8 @@ class CbmPastaDigiData {
size_t Size() const { return fDigis.size(); }
#ifndef NO_ROOT
- ClassDefNV(CbmPastaDigiData, 1);
+ ClassDefNV(CbmMustDigiData, 1);
#endif
};
-#endif //CBMPASTADIGIDATA_H
+#endif //CBMMUSTDIGIDATA_H
diff --git a/reco/app/cbmreco/main.cxx b/reco/app/cbmreco/main.cxx
index 8bb47de69b..7c24c76ee7 100644
--- a/reco/app/cbmreco/main.cxx
+++ b/reco/app/cbmreco/main.cxx
@@ -43,7 +43,7 @@ std::shared_ptr<StorableRecoResults> makeStorableRecoResults(const fles::Timesli
storable->TrdDigis() = ToStdVector(results.trdDigis);
storable->TofDigis() = ToStdVector(results.tofDigis);
storable->RichDigis() = ToStdVector(results.richDigis);
- storable->PastaDigis() = ToStdVector(results.pastaDigis);
+ storable->MustDigis() = ToStdVector(results.mustDigis);
storable->StsClusters() = results.stsClusters;
storable->StsHits() = results.stsHits;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index 5f3cd3ad47..f445694be8 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -204,7 +204,7 @@ void CbmRichMCbmHitProducer::ProcessDigi(CbmEvent* event, Int_t digiIndex)
Int_t DiRICH_Add = (digi->GetAddress() >> 16) & 0xFFFF;
if ((0x7901 <= DiRICH_Add && DiRICH_Add <= 0x7905) || (0x9991 <= DiRICH_Add && DiRICH_Add <= 0x9998)) {
// TRBaddresses 0x7901 to 0x7905 are for FSD/NCAL
- // TRBaddresses 0x9991 to 0x9998 are for PASTA
+ // TRBaddresses 0x9991 to 0x9998 are for MUST
return;
}
fNofDigis++;
--
GitLab