Changeset 10766 for trunk

Timestamp:

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

Author:

tbretz

Message:

Some improvement and name changes.

Location:

trunk/FACT++/src

Files:

• HeadersFAD.cc (modified) (2 diffs)
• HeadersFAD.h (modified) (5 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;
 }
 

trunk/FACT++/src/HeadersFAD.h

@@ -112 +112 @@
         uint16_t fPackageLength;
         uint16_t fVersion;
-        uint16_t fPLLLCK;
+        uint16_t fStatus;
         //
         uint16_t fTriggerCrc;
@@ -182 +182 @@
                      : (fTempDrs[i]&0x007fff))>>3)/16.; }
 
-        uint8_t PllLock() const        { return  fPLLLCK>>12; }
-
-        bool HasDenable() const        { return fPLLLCK&kDenable; }
-        bool HasDwrite() const         { return fPLLLCK&kDwrite; }
-        bool IsRefClockTooHigh() const { return fPLLLCK&kRefClkTooHigh; }
-        bool IsRefClockTooLow() const  { return fPLLLCK&kRefClkTooLow; }
-        bool IsDcmLocked() const       { return fPLLLCK&kDcmLocked; }
-        bool IsDcmReady() const        { return fPLLLCK&kDcmReady; }
-        bool HasSpiSclk() const        { return fPLLLCK&kSpiSclk; }
+        uint8_t PLLLCK() const         { return  fStatus>>12; }
+
+        bool HasDenable() const        { return fStatus&kDenable; }
+        bool HasDwrite() const         { return fStatus&kDwrite; }
+        bool IsRefClockTooHigh() const { return fStatus&kRefClkTooHigh; }
+        bool IsRefClockTooLow() const  { return fStatus&kRefClkTooLow; }
+        bool IsDcmLocked() const       { return fStatus&kDcmLocked; }
+        bool IsDcmReady() const        { return fStatus&kDcmReady; }
+        bool HasSpiSclk() const        { return fStatus&kSpiSclk; }
 
         void clear() { reset(*this); }
@@ -244 +244 @@
 
         uint32_t fFreqRefClock;
-        uint16_t fPLLLCK;
+        uint16_t fStatus;
         uint16_t fAdcClockPhaseShift;
         uint16_t fNumTriggersToGenerate;
@@ -253 +253 @@
             fTimeStamp(h.fTimeStamp),
             fFreqRefClock(h.fFreqRefClock),
-            fPLLLCK(h.fPLLLCK),
+            fStatus(h.fStatus),
             fAdcClockPhaseShift(h.fAdcClockPhaseShift),
             fNumTriggersToGenerate(h.fNumTriggersToGenerate),
@@ -261 +261 @@
         }
 
-        uint8_t PllLock() const        { return fPLLLCK>>12; }
-
-        bool HasDenable() const        { return fPLLLCK&EventHeader::kDenable; }
-        bool HasDwrite() const         { return fPLLLCK&EventHeader::kDwrite; }
-        bool IsRefClockTooHigh() const { return fPLLLCK&EventHeader::kRefClkTooHigh; }
-        bool IsRefClockTooLow() const  { return fPLLLCK&EventHeader::kRefClkTooLow; }
-        bool IsDcmLocked() const       { return fPLLLCK&EventHeader::kDcmLocked; }
-        bool IsDcmReady() const        { return fPLLLCK&EventHeader::kDcmReady; }
-        bool HasSpiSclk() const        { return fPLLLCK&EventHeader::kSpiSclk; }
+        uint8_t PLLLCK() const         { return fStatus>>12; }
+
+        bool HasDenable() const        { return fStatus&EventHeader::kDenable; }
+        bool HasDwrite() const         { return fStatus&EventHeader::kDwrite; }
+        bool IsRefClockTooHigh() const { return fStatus&EventHeader::kRefClkTooHigh; }
+        bool IsRefClockTooLow() const  { return fStatus&EventHeader::kRefClkTooLow; }
+        bool IsDcmLocked() const       { return fStatus&EventHeader::kDcmLocked; }
+        bool IsDcmReady() const        { return fStatus&EventHeader::kDcmReady; }
+        bool HasSpiSclk() const        { return fStatus&EventHeader::kSpiSclk; }
 
     }  __attribute__((__packed__));