Changeset 18808 for trunk

Timestamp:

04/10/17 10:00:36 (8 years ago)

Author:

tbretz

Message:

The ref clock is displayed in MHz not in GHz, display the raw data from the FADs, signal FAD read timeout in print out.

File:

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

trunk/FACT++/src/HeadersFAD.cc

@@ -19 +19 @@
     out << "Time:       " << setprecision(3) << fixed << fTimeStamp/10000. << "s" << endl;
     out << "EvtCounter: " << fEventCounter << " of " << fNumTriggersToGenerate << endl;
-    out << "Trigger:    Type=" << hex << fTriggerType << dec << " Counter=" << fTriggerCounter << " Crc=0x" << hex << fTriggerCrc << endl;
-
+    out << "Trigger:    Type=" << hex << fTriggerType << dec << " Counter=" << fTriggerCounter << " Crc=";
+    if ((fTriggerCrc&0xff00)==0x0100)
+        out << "<timeout>";
+    else
+        out << "0x" << hex << fTriggerCrc;
+    out << " (" << hex << setw(4) << fTriggerCrc << "|" << setw(4) << fTriggerType << "|" << setw(8) << fTriggerCounter << ")" << dec << endl;
     out << "            N/40  = " << dec << GetTriggerLogic() << endl;
     out << "            TRG   =";
@@ -42 +46 @@
     out << "            LPset = " << GetTriggerLPset() << endl;
 
-    out << "RefClock:   " << dec << fFreqRefClock << " (approx. " << fFreqRefClock*2.048 <<  "GHz)" << endl;
+    out << "RefClock:   " << dec << fFreqRefClock << " (approx. " << fFreqRefClock*2.048 <<  "MHz)" << endl;
     out << "PhaseShift: " << fAdcClockPhaseShift << endl;
     out << "Prescaler:  " << fTriggerGeneratorPrescaler << endl;