From 57443a5c26b860d7450cefe30eece5e32da72f36 Mon Sep 17 00:00:00 2001
From: Nam Tran <daq@g2quad-02>
Date: Tue, 24 Nov 2020 18:40:27 -0600
Subject: [PATCH] channel carries board info

---
 channel.cc | 26 ++++++++++++++++++++++++--
 channel.h  |  2 ++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/channel.cc b/channel.cc
index c2733cb..a921004 100644
--- a/channel.cc
+++ b/channel.cc
@@ -23,10 +23,32 @@ Channel::Channel(char const * ptr, size_t len) {
 
 }
 
+Channel::Channel(char const * ptr, size_t len, uint32_t board) {
+   board_id = board;
+   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;
+   }
+
+}
 void Channel::Print(){
    if (valid) {
-      spdlog::get("zynqDump")->info("channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}",
-            id, spill, size, block_count, crossing, integral[0], integral[1], integral[2]);
+      spdlog::get("zynqDump")->info("board {}, channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}",
+            board_id, id, spill, size, block_count, crossing, integral[0], integral[1], integral[2]);
    }
    else {
       spdlog::get("zynqDump")->info("Invalid channel");
diff --git a/channel.h b/channel.h
index 0645745..56431c4 100644
--- a/channel.h
+++ b/channel.h
@@ -5,6 +5,7 @@
 #include <cstdlib>
 
 class Channel {
+   uint32_t board_id;
    uint32_t id;
    uint32_t size;
    uint32_t version;
@@ -16,6 +17,7 @@ class Channel {
    bool valid;
    public:
    Channel(char const * ptr, size_t len);
+   Channel(char const * ptr, size_t len, uint32_t board);
    void Print();
 
 };