Skip to content
Snippets Groups Projects
Commit 4524392d authored by Tobias Bockh's avatar Tobias Bockh
Browse files

update faser-common

parent bd16bda6
No related branches found
No related tags found
No related merge requests found
...@@ -74,11 +74,11 @@ static void dump(const EventFull* re) ...@@ -74,11 +74,11 @@ static void dump(const EventFull* re)
case TriggerSourceID: case TriggerSourceID:
if (re->event_tag() == PhysicsTag ) { if (re->event_tag() == PhysicsTag ) {
std::cout<<"TLB data fragment:"<<std::endl; std::cout<<"TLB data fragment:"<<std::endl;
TLBDataFragment tlb_data_frag = TLBDataFragment(frag->payload<const uint32_t*>(), frag->payload_size()); TLBDataFormat::TLBDataFragment tlb_data_frag = TLBDataFormat::TLBDataFragment(frag->payload<const uint32_t*>(), frag->payload_size());
std::cout<<tlb_data_frag<<std::endl; std::cout<<tlb_data_frag<<std::endl;
} }
else if (re->event_tag() == TLBMonitoringTag ) { else if (re->event_tag() == TLBMonitoringTag ) {
TLBMonitoringFragment tlb_mon_frag = TLBMonitoringFragment(frag->payload<const uint32_t*>(), frag->payload_size()); TLBMonFormat::TLBMonitoringFragment tlb_mon_frag = TLBMonFormat::TLBMonitoringFragment(frag->payload<const uint32_t*>(), frag->payload_size());
std::cout<<"TLB monitoring fragment:"<<std::endl; std::cout<<"TLB monitoring fragment:"<<std::endl;
std::cout<<tlb_mon_frag<<std::endl; std::cout<<tlb_mon_frag<<std::endl;
} }
......
...@@ -53,7 +53,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re, ...@@ -53,7 +53,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re,
} }
// Find the TLB fragment // Find the TLB fragment
const TLBDataFragment* tlb = NULL; const TLBDataFormat::TLBDataFragment* tlb = NULL;
const DAQFormats::EventFragment* frag = NULL; const DAQFormats::EventFragment* frag = NULL;
for(const auto &id : re->getFragmentIDs()) { for(const auto &id : re->getFragmentIDs()) {
frag=re->find_fragment(id); frag=re->find_fragment(id);
...@@ -61,7 +61,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re, ...@@ -61,7 +61,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re,
if ((frag->source_id()&0xFFFF0000) != DAQFormats::SourceIDs::TriggerSourceID) continue; if ((frag->source_id()&0xFFFF0000) != DAQFormats::SourceIDs::TriggerSourceID) continue;
ATH_MSG_DEBUG("Fragment:\n" << *frag); ATH_MSG_DEBUG("Fragment:\n" << *frag);
tlb = new TLBDataFragment(frag->payload<const uint32_t*>(), frag->payload_size()); tlb = new TLBDataFormat::TLBDataFragment(frag->payload<const uint32_t*>(), frag->payload_size());
break; break;
} }
...@@ -82,7 +82,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re, ...@@ -82,7 +82,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re,
xaod->setInputBitsNextClk( tlb->input_bits_next_clk() ); xaod->setInputBitsNextClk( tlb->input_bits_next_clk() );
xaod->setTbp( tlb->tbp() ); xaod->setTbp( tlb->tbp() );
xaod->setTap( tlb->tap() ); xaod->setTap( tlb->tap() );
} catch ( TLBDataException& e ) { } catch ( TLBDataFormat::TLBDataException& e ) {
ATH_MSG_WARNING("FaserTriggerDecoderTool:\n" ATH_MSG_WARNING("FaserTriggerDecoderTool:\n"
<< e.what() << e.what()
<< "\nCorrupted TLB data!\n" << "\nCorrupted TLB data!\n"
......
Subproject commit a14ae110b8261e7e380858e03855e9d432ebcc01 Subproject commit 7eb8e65e8342963e6f7e4d083c6b1128baa49fd1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment