Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,6 @@ void RawPixelDecoder<Mapping>::setupLinks(InputRecord& inputs)
auto nLinks = mGBTLinks.size();
auto origin = (mUserDataOrigin == o2::header::gDataOriginInvalid) ? mMAP.getOrigin() : mUserDataOrigin;
auto datadesc = (mUserDataDescription == o2::header::gDataDescriptionInvalid) ? o2::header::gDataDescriptionRawData : mUserDataDescription;
if (mUserDataDescription != o2::header::gDataDescriptionInvalid) { // overwrite data filter origin&descriptions with user defined ones if possible
for (auto& filt : mInputFilter) {
if (std::holds_alternative<o2::framework::ConcreteDataMatcher>(filt.matcher)) {
std::get<o2::framework::ConcreteDataMatcher>(filt.matcher).origin = origin;
std::get<o2::framework::ConcreteDataMatcher>(filt.matcher).description = datadesc;
}
}
}

// if we see requested data type input with 0xDEADBEEF subspec and 0 payload this means that the "delayed message"
// mechanism created it in absence of real data from upstream. Processor should send empty output to not block the workflow
{
Expand Down
22 changes: 11 additions & 11 deletions Detectors/ITSMFT/common/workflow/src/STFDecoderSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,22 @@ void STFDecoder<Mapping>::init(InitContext& ic)
header::DataDescription dataDesc;
dataOrig.runtimeInit(v1[0].c_str());
dataDesc.runtimeInit(v2[0].c_str());
Mapping map;
for (int iLayer{0}; iLayer < mLayers; ++iLayer) {
auto& dec = mDecoder.emplace_back(std::make_unique<RawPixelDecoder<Mapping>>());
dec->setUserDataOrigin(dataOrig);
dec->setUserDataDescription(dataDesc);
dec->init(); // is this no-op?

if (mDoStaggering) {
std::vector<o2::framework::InputSpec> filter;
for (const auto feeID : map.getLayer2FEEIDs(iLayer)) {
filter.emplace_back("filter", ConcreteDataMatcher{dataOrig, dataDesc, (o2::header::DataHeader::SubSpecificationType)feeID});
}
dec->setInputFilter(filter);
} else {
dec->setInputFilter({InputSpec{"filter", ConcreteDataTypeMatcher(dataOrig, dataDesc)}});
}
}
} catch (const std::exception& e) {
LOG(error) << "exception was thrown in decoder creation: " << e.what();
Expand Down Expand Up @@ -131,17 +142,6 @@ void STFDecoder<Mapping>::init(InitContext& ic)
mClusterer = std::make_unique<Clusterer>();
mClusterer->setNChips(Mapping::getNChips());
}

if (mDoStaggering) {
Mapping map;
for (uint32_t iLayer{0}; iLayer < mLayers; ++iLayer) {
std::vector<o2::framework::InputSpec> filter;
for (const auto feeID : map.getLayer2FEEIDs(iLayer)) {
filter.emplace_back("filter", ConcreteDataMatcher{Mapping::getOrigin(), o2::header::gDataDescriptionRawData, (o2::header::DataHeader::SubSpecificationType)feeID});
}
mDecoder[iLayer]->setInputFilter(filter);
}
}
}

///_______________________________________
Expand Down
Loading