Changeset 10766 for trunk/FACT++/src/HeadersFAD.cc

Timestamp:

05/23/11 08:46:13 (13 years ago)

Author:

tbretz

Message:

Some improvement and name changes.

File:

• trunk/FACT++/src/HeadersFAD.cc (modified) (2 diffs)

trunk/FACT++/src/HeadersFAD.cc

@@ -11 +11 @@
 void FAD::EventHeader::print(std::ostream &out) const
 {
-    out << hex << "Delimiter: ";
+    out << "Delimiter:  ";
     if (fStartDelimiter==kDelimiterStart)
         out << "ok";
     else
-        out << fStartDelimiter;
-    out << " (Crate=" << dec << (fBoardId>>8) << ", Board=" << (fBoardId&0xff) << ", Version=" << (fVersion>>8) << "." << (fVersion&0xff) << ", DNA=" << fDNA <<")" << endl;
+        out << hex << fStartDelimiter;
+    out << " (Crate=" << dec << (fBoardId>>8) << ", Board=" << (fBoardId&0xff) << ", Version=" << (fVersion>>8) << "." << (fVersion&0xff) << ", DNA=" << hex << fDNA <<")" << endl;
 
     out << dec;
     out << "PkgLength:  " << fPackageLength << endl;
 
-    out << "RunNumber:  " << dec<< fRunNumber << endl;
+    out << "RunNumber:  " << fRunNumber << endl;
     out << "Time:       " << fTimeStamp/10000. << "s" << endl;
-    out << "EvtCounter: " << dec << fEventCounter << " of " << fNumTriggersToGenerate << endl;
-    out << "Trigger:    Type=" << dec << fTriggerType << " Id=" << fTriggerId << " Crc=0x" << hex << fTriggerCrc << endl;
+    out << "EvtCounter: " << fEventCounter << " of " << fNumTriggersToGenerate << endl;
+    out << "Trigger:    Type=" << fTriggerType << " Id=" << fTriggerId << " Crc=0x" << hex << fTriggerCrc << endl;
 
     out << "RefClock:   " << dec << fFreqRefClock << endl;
@@ -40 +40 @@
     out << endl;
 
-    out << "PLL_LCK=" << hex << fPLLLCK << endl;
-    out << "  PLL-Lock:         " << hex << PllLock() << endl;
-    out << "  Denable:          " << HasDenable() << endl;
-    out << "  Dwrite:           " << HasDwrite() << endl;
-    out << "  RefClk too high:  " << IsRefClockTooHigh() << endl;
-    out << "  RefClk too low:   " << IsRefClockTooLow() << endl;
-    out << "  DCM locked:       " << IsDcmLocked() << endl;
-    out << "  DCM ready:        " << IsDcmReady() << endl;
-    out << "  SPI_SCLK enabled: " << HasSpiSclk() << endl;
+    out << "Status=" << hex << fStatus << endl;
+    // PllLock -> 1111
+    out << "  RefClk locked (PLLLCK):  " << hex << (int)PLLLCK();
+    if (IsRefClockTooHigh())
+        out << " (too high)";
+    if (IsRefClockTooLow())
+        out << " (too low)";
+    out << endl;
+    out << "  Domino wave (Denable):   " << (HasDenable()?"enabled":"disabled") << endl;
+    out << "  DRS sampling (Dwrite):   " << (HasDwrite()?"enabled":"disabled") << endl;
+    out << "  Dig.clock manager (DCM): " << (IsDcmLocked()?"locked":"unlocked");
+    out << " / " << (IsDcmReady()?"ready":"not ready") << endl;
+    out << "  SPI Serial Clock (SCLK): " << (HasSpiSclk()?"enabled":"disabled") << endl;
 }