Skip to content
Open
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
2 changes: 1 addition & 1 deletion plugins/FakeDataProdModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ FakeDataProdModule::process_data_request(dfmessages::DataRequest& data_request)
data_fragment_ptr->set_trigger_number(data_request.trigger_number);
data_fragment_ptr->set_run_number(m_run_number);
data_fragment_ptr->set_element_id(m_sourceid);
data_fragment_ptr->set_error_bits(0);
data_fragment_ptr->set_status_bits(0); // Do we want to have a kFakeData status bit?
data_fragment_ptr->set_type(m_fragment_type);
data_fragment_ptr->set_trigger_timestamp(data_request.trigger_timestamp);
data_fragment_ptr->set_window_begin(data_request.request_information.window_begin);
Expand Down
9 changes: 5 additions & 4 deletions plugins/FragmentAggregatorModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,13 @@ FragmentAggregatorModule::process_fragment(std::unique_ptr<daqdataformats::Fragm
m_timestamp_before_frag = get_current_time_us();
m_fragments_received++;

std::bitset<32> error_bits = fragment->get_error_bits();
if (error_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentErrorBits::kDataNotFound)])
std::bitset<32> status_bits = fragment->get_status_bits();
if (status_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentStatusBits::kEmptyFragment)] ||
status_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentStatusBits::kLatencyBufferEmpty)])
m_fragments_empty++;
if (error_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentErrorBits::kIncomplete)])
if (status_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentStatusBits::kIncomplete)])
m_fragments_incomplete++;
if (error_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentErrorBits::kInvalidWindow)])
if (status_bits[static_cast<size_t>(dunedaq::daqdataformats::FragmentStatusBits::kInvalidRequestWindow)])
m_fragments_invalid++;

auto dr_iter = m_data_req_map.find(
Expand Down
4 changes: 2 additions & 2 deletions plugins/TRBModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum
namespace dunedaq {
namespace dfmodules {

using daqdataformats::TriggerRecordErrorBits;
using daqdataformats::TriggerRecordStatusBits;

TRBModule::TRBModule(const std::string& name)
: dunedaq::appfwk::DAQModule(name)
Expand Down Expand Up @@ -475,7 +475,7 @@ TRBModule::extract_trigger_record(const TriggerId& id)

m_lost_fragments += missing_fragments;
m_pending_fragment_counter -= missing_fragments;
temp->get_header_ref().set_error_bit(TriggerRecordErrorBits::kIncomplete, true);
temp->get_header_ref().set_status_bit(TriggerRecordStatusBits::kIncomplete, true);

TLOG() << get_name() << " sending incomplete TriggerRecord downstream "
<< (m_stop_requested.load() ? "at Stop time " : "") << "(trigger/run_number=" << id << ", "
Expand Down
Loading