From 4524392db6db0388cca1dd9c50f448e5d8b1692b Mon Sep 17 00:00:00 2001
From: Tobias Boeckh <tobias.boeckh@cern.ch>
Date: Wed, 20 Jan 2021 00:39:47 +0100
Subject: [PATCH] update faser-common
---
Event/FaserByteStreamCnvSvc/src/DumpFrags.h | 4 ++--
.../FaserTriggerByteStream/src/FaserTriggerDecoderTool.cxx | 6 +++---
faser-common | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Event/FaserByteStreamCnvSvc/src/DumpFrags.h b/Event/FaserByteStreamCnvSvc/src/DumpFrags.h
index 989f5b7c..16d4a1ea 100644
--- a/Event/FaserByteStreamCnvSvc/src/DumpFrags.h
+++ b/Event/FaserByteStreamCnvSvc/src/DumpFrags.h
@@ -74,11 +74,11 @@ static void dump(const EventFull* re)
case TriggerSourceID:
if (re->event_tag() == PhysicsTag ) {
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;
}
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_mon_frag<<std::endl;
}
diff --git a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerDecoderTool.cxx b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerDecoderTool.cxx
index f5ac5dff..96bb3a53 100644
--- a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerDecoderTool.cxx
+++ b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerDecoderTool.cxx
@@ -53,7 +53,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re,
}
// Find the TLB fragment
- const TLBDataFragment* tlb = NULL;
+ const TLBDataFormat::TLBDataFragment* tlb = NULL;
const DAQFormats::EventFragment* frag = NULL;
for(const auto &id : re->getFragmentIDs()) {
frag=re->find_fragment(id);
@@ -61,7 +61,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re,
if ((frag->source_id()&0xFFFF0000) != DAQFormats::SourceIDs::TriggerSourceID) continue;
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;
}
@@ -82,7 +82,7 @@ FaserTriggerDecoderTool::convert(const DAQFormats::EventFull* re,
xaod->setInputBitsNextClk( tlb->input_bits_next_clk() );
xaod->setTbp( tlb->tbp() );
xaod->setTap( tlb->tap() );
- } catch ( TLBDataException& e ) {
+ } catch ( TLBDataFormat::TLBDataException& e ) {
ATH_MSG_WARNING("FaserTriggerDecoderTool:\n"
<< e.what()
<< "\nCorrupted TLB data!\n"
diff --git a/faser-common b/faser-common
index a14ae110..7eb8e65e 160000
--- a/faser-common
+++ b/faser-common
@@ -1 +1 @@
-Subproject commit a14ae110b8261e7e380858e03855e9d432ebcc01
+Subproject commit 7eb8e65e8342963e6f7e4d083c6b1128baa49fd1
--
GitLab