diff --git a/channel.cc b/channel.cc index a921004..bab173c 100644 --- a/channel.cc +++ b/channel.cc @@ -47,7 +47,7 @@ Channel::Channel(char const * ptr, size_t len, uint32_t board) { } void Channel::Print(){ if (valid) { - spdlog::get("zynqDump")->info("board {}, channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}", + spdlog::get("zynqDump")->debug("board {}, channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}", board_id, id, spill, size, block_count, crossing, integral[0], integral[1], integral[2]); } else { diff --git a/client.cc b/client.cc index 7fc7ab9..709ad7c 100644 --- a/client.cc +++ b/client.cc @@ -33,7 +33,7 @@ bool bad_data = true; int open_socket(); void signalHandler( int signum ); void setup_logger(); -size_t process_channel(char const * ptr, size_t len); +size_t process_channel(char const * ptr, size_t len, uint32_t board_id); size_t process_block(char const * ptr, size_t len); size_t process_block(char const * ptr, size_t len){ return len; @@ -107,8 +107,10 @@ int main(int argc, char * argv[]) size_t bytes_left = (frameSize - 3 * sizeof(uint32_t)); size_t bytes_processed = 0; while ((bytes_left - bytes_processed >= MIN_CHANNEL_SIZE) && (bytes_processed < bytes_left)) { - bytes_processed += process_channel(char_buffer + 2 * sizeof(uint32_t) + bytes_processed, - bytes_left - bytes_processed); + bytes_processed += process_channel( + char_buffer + 2 * sizeof(uint32_t) + bytes_processed, + bytes_left - bytes_processed, + static_cast(board_id)); } spdlog::get("zynqDump")->debug("Done, {} bytes processed.", bytes_processed); } @@ -163,7 +165,7 @@ void setup_logger(){ } } -size_t process_channel(char const * ptr, size_t len){ +size_t process_channel(char const * ptr, size_t len, uint32_t board_id){ if ((len < MIN_CHANNEL_SIZE) || (len > MAX_CHANNEL_SIZE)) { spdlog::debug("channel length must be between {} and {}.", MIN_CHANNEL_SIZE, MAX_CHANNEL_SIZE); @@ -209,7 +211,7 @@ size_t process_channel(char const * ptr, size_t len){ // processing bytes_left -= channel_size; - Channel c(ptr, channel_size); + Channel c(ptr, channel_size, board_id); c.Print(); } }