Skip to content

Commit 8eef27f

Browse files
committed
update header to string methods
1 parent cade82e commit 8eef27f

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

src/StfBuilder/StfBuilderDevice.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void StfBuilderDevice::InitTask()
135135
(ReadoutDataUtils::sSpecifiedDataOrigin == o2::header::gDataOriginMFT))) {
136136

137137
EDDLOG("Run type paramter 'topology' is supported only for ITS and MFT. Please specify the detector option. detector={}",
138-
std::string(ReadoutDataUtils::sSpecifiedDataOrigin.str));
138+
ReadoutDataUtils::sSpecifiedDataOrigin.as<std::string>());
139139
throw std::logic_error("Run type paramter 'topology' is supported only for ITS and MFT. Please specify the detector option.");
140140
}
141141
}
@@ -207,7 +207,7 @@ void StfBuilderDevice::InitTask()
207207
"readout and not using RDHv6 or greater.");
208208
std::this_thread::sleep_for(1s); exit(-1);
209209
} else {
210-
IDDLOG("READOUT INTERFACE: Configured detector: {}", ReadoutDataUtils::sSpecifiedDataOrigin.str);
210+
IDDLOG("READOUT INTERFACE: Configured detector: {}", ReadoutDataUtils::sSpecifiedDataOrigin.as<std::string>());
211211
}
212212

213213
if (ReadoutDataUtils::sRdhVersion == ReadoutDataUtils::RdhVersion::eRdhInvalid) {

src/StfSender/StfSenderOutput.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void StfSenderOutput::StfSchedulerThread()
298298
continue;
299299
}
300300

301-
lInfoPtr->set_data_origin(std::string(lStfEquip.begin()->mDataOrigin.str, 3));
301+
lInfoPtr->set_data_origin(lStfEquip.begin()->mDataOrigin.as<std::string>());
302302
lInfoPtr->set_data_subspec(lStfEquip.begin()->mSubSpecification);
303303
break;
304304
}

src/common/ReadoutDataModel.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ReadoutDataUtils::getDataOrigin(const RDHReader &R)
4747
return lOrig;
4848
} else {
4949
EDDLOG_RL(1000, "Data origin in RDH is invalid: {}. Please configure the correct SYSTEM_ID in the hardware."
50-
" Using the configuration value {}.", R.getSystemID(), std::string(sSpecifiedDataOrigin.str));
50+
" Using the configuration value {}.", R.getSystemID(), sSpecifiedDataOrigin.as<std::string>());
5151
}
5252
}
5353

src/common/SubTimeFrameBuilder.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ FairMQMessagePtr TimeFrameBuilder::newHeaderMessage(const char *pData, const std
435435
// Get the DH
436436
DataHeader *lDataHdr = const_cast<DataHeader*>(reinterpret_cast<const DataHeader*>(pData));
437437
if (lDataHdr->description != DataHeader::sHeaderType) {
438-
EDDLOG_RL(1000, "TimeFrameBuilder: Unknown header type {}", std::string(lDataHdr->description.str));
438+
EDDLOG_RL(1000, "TimeFrameBuilder: Unknown header type {}", lDataHdr->description.as<std::string>());
439439
return nullptr;
440440
}
441441

src/common/SubTimeFrameDPL.cxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ void StfToDplAdapter::inspect() const
166166
// check origin
167167
if (lOrigin != lSplitDh->dataOrigin || lType != lSplitDh->dataDescription || lSubSpec != lSplitDh->subSpecification) {
168168
EDDLOG("DPL output: origin of the split-payload message is invalid. "
169-
"[0]=<{}{}{}> [{}]=<{}{}{}>", lOrigin.str, lType.str, lSubSpec,
170-
lSplitI, lSplitDh->dataOrigin.str, lSplitDh->dataDescription.str, lSplitDh->subSpecification);
169+
"[0]=<{}{}{}> [{}]=<{}{}{}>", lOrigin.as<std::string>(), lType.as<std::string>(), lSubSpec,
170+
lSplitI, lSplitDh->dataOrigin.as<std::string>(), lSplitDh->dataDescription.as<std::string>(), lSplitDh->subSpecification);
171171
break;
172172
}
173173

@@ -291,7 +291,8 @@ void DplToStfAdapter::visit(SubTimeFrame& pStf)
291291
}
292292

293293
if (!lStfHeaderFound) {
294-
throw std::runtime_error("STF receive error: missing SubTimeFrame::Header missing_o2_hdr=" + std::string(gDataDescSubTimeFrame.str));
294+
throw std::runtime_error("STF receive error: missing SubTimeFrame::Header missing_o2_hdr=" +
295+
gDataDescSubTimeFrame.as<std::string>());
295296
}
296297
}
297298

src/common/SubTimeFrameDataModel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ struct EquipmentIdentifier {
172172
const std::string info() const
173173
{
174174
return fmt::format("{}/{}/{}",
175-
std::string(mDataOrigin.str),
176-
std::string(mDataDescription.str),
175+
mDataOrigin.as<std::string>(),
176+
mDataDescription.as<std::string>(),
177177
mSubSpecification);
178178
}
179179
};

src/common/SubTimeFrameFileWriter.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ std::uint64_t SubTimeFrameFileWriter::_write(const SubTimeFrame& pStf)
316316
impl::sInfoVal(lValRow, impl::TF_ID, l1StfId);
317317
impl::sInfoVal(lValRow, impl::TF_OFFSET, l2StfFileOff);
318318
impl::sInfoVal(lValRow, impl::TF_SIZE, l3StfFileSize);
319-
impl::sInfoVal(lValRow, impl::ORIGIN, l4DataOrigin.str);
320-
impl::sInfoVal(lValRow, impl::DESC, l5DataDescription.str);
319+
impl::sInfoVal(lValRow, impl::ORIGIN, l4DataOrigin.as<std::string>());
320+
impl::sInfoVal(lValRow, impl::DESC, l5DataDescription.as<std::string>());
321321
impl::sInfoVal(lValRow, impl::SUBSPEC, l6SubSpec);
322322
impl::sInfoVal(lValRow, impl::DATA_IDX, l7DataIndex);
323323
impl::sInfoVal(lValRow, impl::HDR_OFF, l8HdrOff);

0 commit comments

Comments
 (0)