Merge pull request #50 from ornlneutronimaging/49-minor-bug-found-in-…

…parsing-gdc-packet Minor fix 44 bits to 48 bits check for GDC packet
ornlneutronimaging · Oct 17, 2023 · 33af051 · 33af051
2 parents 9b7d193 + dc13281
commit 33af051
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sophiread/FastSophiread/src/tpx3_fast.cpp b/sophiread/FastSophiread/src/tpx3_fast.cpp
@@ -208,7 +208,7 @@ void update_gdc_timestamp_and_timer_lsb32(const char *char_array, unsigned long
 
   // process given GDC packet
   gdclast = (unsigned long *)(&char_array[0]);
-  mygdc = (((*gdclast) >> 16) & 0xFFFFFFFFFFF);
+  mygdc = (((*gdclast) >> 16) & 0xFFFFFFFFFFFF);
 
   switch (((mygdc >> 40) & 0xF)) {
     case 0x4:

diff --git a/sophiread/SophireadLib/src/tpx3.cpp b/sophiread/SophireadLib/src/tpx3.cpp
@@ -370,7 +370,7 @@ std::vector<Hit> readTimepix3RawData(const std::string &filepath) {
         } else if ((data_packet[7] & 0xF0) == 0x40) {
           // GDC data packet
           gdclast = (unsigned long *)(&data_packet[0]);
-          mygdc = (((*gdclast) >> 16) & 0xFFFFFFFFFFF);
+          mygdc = (((*gdclast) >> 16) & 0xFFFFFFFFFFFF);
           if (((mygdc >> 40) & 0xF) == 0x4) {
             Timer_LSB32 = mygdc & 0xFFFFFFFF;  // 32-bit
           } else if (((mygdc >> 40) & 0xF) == 0x5) {