From fefe3acaff8cc7281771379d2098a9e80d4e8055 Mon Sep 17 00:00:00 2001
From: Giovanna Lazzari Miotto <giovanna.lazzari.miotto@cern.ch>
Date: Tue, 23 Apr 2024 18:06:20 +0200
Subject: [PATCH] tidy: Address type mismatches
tidy: Use correct printing format
---
src/TcpInputFilter.cc | 2 +-
src/bmtf_orbit_processor.cc | 2 +-
src/calo_obj_orbit_processor.cc | 2 +-
src/calo_orbit_processor.cc | 2 +-
src/calo_sum_orbit_processor.cc | 7 ++-----
src/muon_orbit_processor.cc | 2 +-
src/ugt_orbit_processor.cc | 4 ++--
7 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/TcpInputFilter.cc b/src/TcpInputFilter.cc
index b8dd4a12..269d8e83 100644
--- a/src/TcpInputFilter.cc
+++ b/src/TcpInputFilter.cc
@@ -151,7 +151,7 @@ ssize_t TcpInputFilter::readPacketFromTcp(char **buffer, size_t bufferSize) {
// check if header marker is in the frame
// if not, try again N times
if (header->feedbeef != 0xfeedbeeffeedbeef) {
- printf("Frame 0x%16lu_%16lu_%16lu_%16lu\n", header->feedbeef, header->frames_in_packet,
+ printf("Frame 0x%16lu_%16u_%16u_%16u\n", header->feedbeef, header->frames_in_packet,
header->orbit_dropped_counter, header->orbit_seen_counter);
stats.nbHeaderDesync++;
throw std::runtime_error("FATAL: Header not found.");
diff --git a/src/bmtf_orbit_processor.cc b/src/bmtf_orbit_processor.cc
index dceb5e1c..3e686532 100644
--- a/src/bmtf_orbit_processor.cc
+++ b/src/bmtf_orbit_processor.cc
@@ -32,5 +32,5 @@ int BmtfOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegion &
writeable_block.Fill(meta);
writeable_block.Fill(bx_data.GetBuffer(), bx_data.GetSize());
- return bx_data.count; // Original incremented counts by sCount
+ return bx_data.count;
}
\ No newline at end of file
diff --git a/src/calo_obj_orbit_processor.cc b/src/calo_obj_orbit_processor.cc
index 75ece0bd..f6f09e44 100644
--- a/src/calo_obj_orbit_processor.cc
+++ b/src/calo_obj_orbit_processor.cc
@@ -33,5 +33,5 @@ int CaloObjOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegio
writeable_block.Fill(meta);
writeable_block.Fill(bx_data.GetBuffer(), bx_data.GetSize());
- return bx_data.count; // Original increments counts for each oBlocksOn toggled.
+ return bx_data.count;
}
diff --git a/src/calo_orbit_processor.cc b/src/calo_orbit_processor.cc
index b9618eaf..12040534 100644
--- a/src/calo_orbit_processor.cc
+++ b/src/calo_orbit_processor.cc
@@ -25,5 +25,5 @@ int CaloOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegion &
writeable_block.Fill(BxMetadata{meta.header, meta.bx, meta.orbit});
writeable_block.Fill(bx_data.GetBuffer(), bx_data.GetSize());
- return 1; // Returns one in the original
+ return 1;
}
\ No newline at end of file
diff --git a/src/calo_sum_orbit_processor.cc b/src/calo_sum_orbit_processor.cc
index 2228e131..9bf464e7 100644
--- a/src/calo_sum_orbit_processor.cc
+++ b/src/calo_sum_orbit_processor.cc
@@ -6,20 +6,17 @@ int CaloSumOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegio
BxMetadata meta) {
struct BxMetadataType {
uint32_t bx;
- uint32_t orbit;
+ int orbit;
};
using SourceDataType = blockCaloSum;
- using SinkDataType = uint32_t;
- // const uint32_t source_data_length = 6;
assert(readable_block.CheckBounds(sizeof(SourceDataType)));
SourceDataType *bl = readable_block.Scan<SourceDataType>();
- // BxData<SinkDataType, source_data_length> bx_data;
writeable_block.Fill(BxMetadataType{meta.bx, meta.orbit});
writeable_block.Fill(bl->calo_sum, sizeof(bl->calo_sum));
- return 6; // Original left counts at zero
+ return 6;
}
\ No newline at end of file
diff --git a/src/muon_orbit_processor.cc b/src/muon_orbit_processor.cc
index b11ba85e..46b6ee61 100644
--- a/src/muon_orbit_processor.cc
+++ b/src/muon_orbit_processor.cc
@@ -52,5 +52,5 @@ int MuonOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegion &
writeable_block.Fill(bx_data_1.GetBuffer(), bx_data_1.GetSize());
writeable_block.Fill(bx_data_2.GetBuffer(), bx_data_2.GetSize());
- return bx_data_1.count + bx_data_2.count; // Original increments counts with this sum
+ return bx_data_1.count + bx_data_2.count;
}
diff --git a/src/ugt_orbit_processor.cc b/src/ugt_orbit_processor.cc
index c6ed53b4..b23b0aa8 100644
--- a/src/ugt_orbit_processor.cc
+++ b/src/ugt_orbit_processor.cc
@@ -6,7 +6,7 @@ int UgtOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegion &w
BxMetadata meta) {
struct BxMetadataType {
uint32_t bx;
- uint32_t orbit;
+ int orbit;
};
using SourceDataType = blockUgt;
@@ -17,5 +17,5 @@ int UgtOrbitProcessor::ProcessBlock(MemRegion &readable_block, WriteMemRegion &w
memcpy(writeable_block.Scan<SourceDataType>(), readable_block.Scan<SourceDataType>(),
sizeof(SourceDataType));
- return 1; // Original left counts at zero
+ return 1;
}
\ No newline at end of file
--
GitLab