Skip to content

Commit

Permalink
Moving from the legacy TDE frame to the new TDEEth frame
Browse files Browse the repository at this point in the history
  • Loading branch information
alessandrothea committed Jun 1, 2024
1 parent 8f94b5e commit cb03912
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions plugins/NICSender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <rte_udp.h>

#include "dpdklibs/udp/PacketCtor.hpp"
#include "fddetdataformats/TDE16Frame.hpp"
#include "fddetdataformats/TDEEthFrame.hpp"

#include "readoutlibs/utils/RateLimiter.hpp"

Expand Down Expand Up @@ -352,7 +352,7 @@ NICSender::do_start(const data_t&)
{
m_run_mark.store(true);
if (m_frontend_type == "tde") {
auto fun = &lcore_main<fddetdataformats::TDE16Frame>;
auto fun = &lcore_main<fddetdataformats::TDEEthFrame>;
for (auto& [id, _] : m_core_map) {
TLOG() << "Starting core " << id;
rte_eal_remote_launch(fun, reinterpret_cast<void*>(this), id);
Expand Down
8 changes: 4 additions & 4 deletions src/CreateSource.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
#include "readoutlibs/ReadoutIssues.hpp"

#include "fdreadoutlibs/DUNEWIBEthTypeAdapter.hpp"
#include "fdreadoutlibs/TDEFrameTypeAdapter.hpp"
#include "fdreadoutlibs/TDEEthTypeAdapter.hpp"

#include <memory>
#include <string>

namespace dunedaq {

DUNE_DAQ_TYPESTRING(dunedaq::fdreadoutlibs::types::DUNEWIBEthTypeAdapter, "WIBEthFrame")
DUNE_DAQ_TYPESTRING(dunedaq::fdreadoutlibs::types::TDEFrameTypeAdapter, "TDEFrame")
DUNE_DAQ_TYPESTRING(dunedaq::fdreadoutlibs::types::TDEEthTypeAdapter, "TDEEthFrame")

namespace dpdklibs {

Expand Down Expand Up @@ -62,9 +62,9 @@ createSourceModel(const std::string& conn_uid, bool callback_mode)
// Return with setup model
return source_model;

} else if (raw_dt.find("TDEFrame") != std::string::npos) {
} else if (raw_dt.find("TDEEthFrame") != std::string::npos) {
// WIB2 specific char arrays
auto source_model = std::make_unique<SourceModel<fdreadoutlibs::types::TDEFrameTypeAdapter>>();
auto source_model = std::make_unique<SourceModel<fdreadoutlibs::types::TDEEthTypeAdapter>>();
source_model->set_sink(conn_uid, callback_mode);
//auto& parser = source_model->get_parser();
//parser.process_chunk_func = parsers::fixsizedChunkInto<fdreadoutlibs::types::DUNEWIBSuperChunkTypeAdapter>(sink);
Expand Down

0 comments on commit cb03912

Please sign in to comment.