diff --git a/channel.cc b/channel.cc index bab173c..ad235fc 100644 --- a/channel.cc +++ b/channel.cc @@ -1,32 +1,11 @@ #include "channel.h" #include "spdlog/spdlog.h" -Channel::Channel(char const * ptr, size_t len) { - valid = true; - uint32_t * wordData = (uint32_t *)ptr; - size = ((wordData[0] & 0xFFFFFF00) >> 8) * sizeof(uint32_t); - if (size != len) valid = false; - - version = wordData[0] && 0xFF; - if (version != 0x1) valid = false; - - for (int i = 0; i < 3; i++) - integral[i] = (wordData[i + 1] & 0xFFFFFF00)>>8; - - crossing = wordData[4] & 0x00FFFFFF; - block_count = (wordData[5] &0xFF000000) >> 24; - id = (wordData[5] & 0x00FF0000) >> 16; - spill = (wordData[5] & 0x0000FFFF); - if ((id > 8) || (id < 1)) { - valid = false; - } - -} - Channel::Channel(char const * ptr, size_t len, uint32_t board) { board_id = board; valid = true; uint32_t * wordData = (uint32_t *)ptr; + block_data = (char *)ptr; size = ((wordData[0] & 0xFFFFFF00) >> 8) * sizeof(uint32_t); if (size != len) valid = false; @@ -34,10 +13,10 @@ Channel::Channel(char const * ptr, size_t len, uint32_t board) { if (version != 0x1) valid = false; for (int i = 0; i < 3; i++) - integral[i] = (wordData[i + 1] & 0xFFFFFF00)>>8; + integral[i] = ((int32_t)(wordData[i+1])) >> 8; crossing = wordData[4] & 0x00FFFFFF; - block_count = (wordData[5] &0xFF000000) >> 24; + block_count = wordData[5] >> 24; id = (wordData[5] & 0x00FF0000) >> 16; spill = (wordData[5] & 0x0000FFFF); if ((id > 8) || (id < 1)) { @@ -45,9 +24,16 @@ Channel::Channel(char const * ptr, size_t len, uint32_t board) { } } -void Channel::Print(){ +void Channel::Print(bool raw){ if (valid) { - spdlog::get("zynqDump")->debug("board {}, channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}", + if (raw) { + uint32_t * wordData = (uint32_t *)block_data; + spdlog::info("{:08X} {:08X} {:08X}", wordData[0], wordData[1], wordData[2]); + spdlog::info("{:08X} {:08X} {:08X}", wordData[3], wordData[4], wordData[5]); + } + // spdlog::get("channel_logger")->info("board {}, channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}", + // board_id, id, spill, size, block_count, crossing, integral[0], integral[1], integral[2]); + spdlog::info("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/channel.h b/channel.h index 56431c4..67866b2 100644 --- a/channel.h +++ b/channel.h @@ -16,9 +16,8 @@ class Channel { char * block_data; bool valid; public: - Channel(char const * ptr, size_t len); Channel(char const * ptr, size_t len, uint32_t board); - void Print(); + void Print(bool raw = false); }; #endif /* end of include guard */ diff --git a/client.cc b/client.cc index 709ad7c..97c1d97 100644 --- a/client.cc +++ b/client.cc @@ -156,8 +156,9 @@ int open_socket(){ void setup_logger(){ try { auto max_size = 1048576 * 5; - auto max_files = 3; - auto logger = spdlog::rotating_logger_mt("zynqDump", "logs/dump.txt", max_size, max_files); + auto max_files = 20; + auto logger = spdlog::rotating_logger_mt("zynqDump", "output/run.txt", max_size, max_files); + auto channel_logger = spdlog::rotating_logger_mt("channel_logger", "output/chn.txt", max_size * 10, max_files); } catch (const spdlog::spdlog_ex &ex) { std::cerr << "Log init failed: " << ex.what() << std::endl; @@ -212,7 +213,7 @@ size_t process_channel(char const * ptr, size_t len, uint32_t board_id){ bytes_left -= channel_size; Channel c(ptr, channel_size, board_id); - c.Print(); + c.Print(true); } }