From 6bedc179ac99c08e6f9a7c8fbce0cd19dee3c90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Mon, 4 Feb 2019 13:20:04 +0000
Subject: [PATCH] SW-546: Use const uint32_t types for constant values not
macros
Follow up because Cmake did not bother to rebuilt a C++ executable that depends
on the header file where I replaced the macros.
---
RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc b/RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc
index fa0ea4afe88..d99e542f986 100644
--- a/RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc
+++ b/RTCP/Cobalt/OutputProc/scripts/tbb-printframes.cc
@@ -39,8 +39,8 @@ void printHeader(const LOFAR::Cobalt::TBB_Header& h) {
cout << "Sample Nr: " << h.sampleNr << endl;
} else {
cout << "Spectral" << endl;
- cout << "Band Nr: " << (h.bandSliceNr & TBB_BAND_NR_MASK) << " (real packet headers indicate this may be not the band nr but an index(?))" << endl;
- cout << "Slice Nr: " << (h.bandSliceNr >> TBB_SLICE_NR_SHIFT) << endl;
+ cout << "Band Nr: " << (h.bandSliceNr & LOFAR::Cobalt::TBB_BAND_NR_MASK) << " (real packet headers indicate this may be not the band nr but an index(?))" << endl;
+ cout << "Slice Nr: " << (h.bandSliceNr >> LOFAR::Cobalt::TBB_SLICE_NR_SHIFT) << endl;
}
cout << "NSamples/fr: " << h.nOfSamplesPerFrame << endl;
if (!transient) {
@@ -95,7 +95,7 @@ void printFakeInput() {
hdr0.sampleFreq = 200;
hdr0.seqNr = 10000;
hdr0.time = 1380240059;
- hdr0.sampleNrOrBandSliceNr = (17 << TBB_SLICE_NR_SHIFT) | 14; // sliceNr=17; bandNr is 14 (but from real data, the 1st band nr emitted is always 0, so maybe it's an index in the requested (but sorted?) band list?)
+ hdr0.sampleNrOrBandSliceNr = (17 << LOFAR::Cobalt::TBB_SLICE_NR_SHIFT) | 14; // sliceNr=17; bandNr is 14 (but from real data, the 1st band nr emitted is always 0, so maybe it's an index in the requested (but sorted?) band list?)
hdr0.nOfSamplesPerFrame = 487;
hdr0.nOfFreqBands = 487/8 * 2 + 2; // 122, as set in the sb bitmap below
--
GitLab