Changeset 10640

Timestamp:

05/10/11 11:00:47 (14 years ago)

Author:

tbretz

Message:

Fixed the Converter::GetHex for the col==0 case.

Location:

trunk/FACT++/src

Files:

• Converter.h (modified) (3 diffs)
• HeadersFTM.cc (modified) (1 diff)

trunk/FACT++/src/Converter.h

@@ -12 +12 @@
 #include <stdexcept>
 
+#include <iostream>
 class Converter
 {
@@ -109 +110 @@
         text << std::hex;
 
-        const size_t w = log2l(size+1)/4+1;
+        const size_t w = nearbyint(ceil(log2(size+1)))/4+1;
 
         for (size_t i=0; i<size/sizeof(T); i++)
@@ -116 +117 @@
                 text << std::setfill('0') << std::setw(w) << i << "| ";
 
-            text << std::setfill('0') << std::setw(2*sizeof(T)) << (unsigned int)ptr[i];
-            text << ':';
+            text << std::setfill('0') << std::setw(2*sizeof(T));
+            text << (unsigned int)ptr[i] << ':';
 
-            if (i%col==col-1)
+            if (col!=0 && i%col==col-1)
                 text << '\n';
+
         }
 

trunk/FACT++/src/HeadersFTM.cc

@@ -151 +151 @@
     out << "       CRC counter = " << dec << fCrcErrorCounter << endl;
     out << "       CRC         = " << hex << fCrcCheckSum << endl;
-//  out << "       Data: " << Converter::GetHex<unsigned short>(fData, 0, false) << endl;
+    out << "       Data: " << Converter::GetHex<unsigned short>(fData, 0, false) << endl;
 }