Changeset 10593 for trunk/FACT++/src

Timestamp:

05/05/11 21:37:48 (14 years ago)

Author:

tbretz

Message:

Fixed type of fClockConditioner; added proper byte swapping for fClockConditioner; some improvements to output; fixed printing of error message.

Location:

trunk/FACT++/src

Files:

• HeadersFTM.cc (modified) (5 diffs)
• HeadersFTM.h (modified) (4 diffs)

trunk/FACT++/src/HeadersFTM.cc

@@ -11 +11 @@
 void FTM::Header::print(std::ostream &out) const
 {
-    out << "State=" << fState;
+    out << "State=" << std::dec << fState;
     out << "  Type=" << fType;
     out << "  (len=" << fDataSize << ")";
@@ -30 +30 @@
 void FTM::FtuList::print(std::ostream &out) const
 {
-    out << "Number of boards responded: " << fNumBoards << " (";
+    out << "Number of boards responded: " << std::dec << fNumBoards << " (";
     out << fNumBoardsCrate[0] << ", ";
     out << fNumBoardsCrate[1] << ", ";
@@ -62 +62 @@
 void FTM::DynamicData::print(std::ostream &out) const
 {
-    out << "OnTime=" << fOnTimeCounter << " ";
+    out << "OnTime=" << std::dec << fOnTimeCounter << " ";
     out << "Temp=(";
     out << fTempSensor[0] << ",";
@@ -112 +112 @@
     out << "Dead time:         " << fDeadTime*4+8 << "ns" << endl;
     out << "Clock conditioner:";
-    out << std::hex;
+    out << std::hex << setfill('0');
     for (int i=0; i<8; i++)
-        out << " " << fClockConditioner[i];
+        out << " " << setw(8) << fClockConditioner[i];
     out << endl;
     out << "Active FTUs:       ";
@@ -137 +137 @@
     out << "       Delimiter   = " << (fDelimiter=='@'?"ok":"wrong") << endl;
     out << "       Path        = ";
-    out << (fSrcAddress &0x3) << ":" << (fSrcAddress >>2) << " --> ";
-    out << (fDestAddress&0x3) << ":" << (fDestAddress>>2) << endl;
+    if (fSrcAddress==0xc0)
+        out << "FTM(192)";
+    else
+        out << "FTU(" << (fSrcAddress &0x3) << ":" << (fSrcAddress >>2) << ")";
+    out << " --> ";
+    if (fDestAddress==0xc0)
+        out << "FTM(192)";
+    else
+        out << "FTU(" << (fDestAddress&0x3) << ":" << (fDestAddress>>2) << ")";
+    out << endl;
     out << "       FirmwareId  = " << hex << fFirmwareId << endl;
     out << "       Command     = " << hex << fCommand << endl;
     out << "       CRC counter = " << dec << fCrcErrorCounter << endl;
     out << "       CRC         = " << hex << fCrcCheckSum << endl;
-    out << "       Data: " << Converter::GetHex<unsigned int>(fData, 21, 0, false) << endl;
+    out << "       Data: " << Converter::GetHex<unsigned short>(fData, 0, false) << endl;
 }

trunk/FACT++/src/HeadersFTM.h

@@ -306 +306 @@
         uint16_t fDelayTimeMarker;
         uint16_t fDeadTime;
-        uint16_t fClockConditioner[8];  // R0, R1, R8, R9, R11, R13, R14, R15
+        uint32_t fClockConditioner[8];  // R0, R1, R8, R9, R11, R13, R14, R15
         uint16_t fWindowPhysics;
         uint16_t fWindowCalib;
@@ -319 +319 @@
         std::vector<uint16_t> HtoN() const
         {
-            return htoncpy(*this);
+            StaticData d(*this);
+            for (int i=0; i<8; i++)
+                Reverse(d.fClockConditioner+i);
+
+            return htoncpy(d);
         }
 
@@ -325 +329 @@
         {
             ntohcpy(vec, *this);
+
+            for (int i=0; i<8; i++)
+                Reverse(fClockConditioner+i);
         }
 
@@ -398 +405 @@
                        (uint64_t(d.fActiveFTU[2])<<20) |
                        (uint64_t(d.fActiveFTU[3])<<30)),
-            fTriggerInterval(d.fTriggerInterval*4+8),
+            fTriggerInterval(d.fTriggerInterval),
             fTriggerSeqLPint((d.fTriggerSequence)&0x1f),
             fTriggerSeqLPext((d.fTriggerSequence>>5)&0x1f),