Changeset 11357

Timestamp:

07/12/11 12:00:08 (13 years ago)

Author:

tbretz

Message:

Improved a bit the console output.

File:

• trunk/FACT++/src/fad.cc (modified) (10 diffs)

trunk/FACT++/src/fad.cc

@@ -176 +176 @@
             case kCmdDrsEnable+0x100:
                 fHeader.Enable(FAD::EventHeader::kDenable, fBufCommand[0]==kCmdDrsEnable);
-                cout << "-> DrsEnable" << endl;
+                cout << "-> DrsEnable " << fBoardId << " " << (fBufCommand[0]==kCmdDrsEnable) << endl;
                 break;
 
@@ -182 +182 @@
             case kCmdDwrite+0x100:
                 fHeader.Enable(FAD::EventHeader::kDwrite, fBufCommand[0]==kCmdDwrite);
-                cout << "-> Dwrite" << endl;
+                cout << "-> Dwrite " << fBoardId << " " << (fBufCommand[0]==kCmdDwrite) << endl;
                 break;
 
             case kCmdTriggerLine:
             case kCmdTriggerLine+0x100:
-                cout << "-> Trigger line" << endl;
+                cout << "-> Trigger line " << fBoardId << " " << (fBufCommand[0]==kCmdTriggerLine) << endl;
                 fTriggerEnabled = fBufCommand[0]==kCmdTriggerLine;
                 fHeader.Enable(FAD::EventHeader::kTriggerLine, fTriggerEnabled);
@@ -194 +194 @@
             case kCmdSclk:
             case kCmdSclk+0x100:
-                cout << "-> Sclk" << endl;
+                cout << "-> Sclk " << fBoardId << endl;
                 fHeader.Enable(FAD::EventHeader::kSpiSclk, fBufCommand[0]==kCmdSclk);
                 break;
@@ -200 +200 @@
             case kCmdSrclk:
             case kCmdSrclk+0x100:
-                cout << "-> Drclk" << endl;
+                cout << "-> Drclk " << fBoardId << endl;
                 break;
 
@@ -206 +206 @@
             case kCmdRun+0x100:
                 fStartTime = Time(Time::utc).UnixTime();
-                cout << "-> Run" << endl;
+                cout << "-> Run " << fBoardId << endl;
                 break;
 
             case kCmdBusy:
             case kCmdBusy+0x100:
-                cout << "-> Busy" << endl;
+                cout << "-> Busy " << fBoardId << " " << (fBufCommand[0]==kCmdBusy) << endl;
                 fHeader.Enable(FAD::EventHeader::kBusy, fBufCommand[0]==kCmdBusy);
                 break;
@@ -217 +217 @@
             case kCmdSocket:
             case kCmdSocket+0x100:
-                cout << "-> Socket" << endl;
+                cout << "-> Socket " << fBoardId << " " << (fBufCommand[0]==kCmdSocket) << endl;
                 fCommandSocket = fBufCommand[0]==kCmdSocket;
                 fHeader.Enable(FAD::EventHeader::kSock17, !fCommandSocket);
@@ -229 +229 @@
                     fTriggerSendData.cancel();
                 fHeader.Enable(FAD::EventHeader::kContTrigger, fBufCommand[0]==kCmdContTrigger);
-                cout << "-> ContTrig" << endl;
+                cout << "-> ContTrig " << fBoardId << " " << (fBufCommand[0]==kCmdContTrigger) << endl;
                 break;
 
             case kCmdResetTriggerId:
-                cout << "-> ResetId" << endl;
+                cout << "-> ResetId " << fBoardId << endl;
                 fHeader.fEventCounter = 0;
                 break;
@@ -243 +243 @@
 
             case kCmdWriteExecute:
-                cout << "-> Execute" << endl;
+                cout << "-> Execute " << fBoardId << endl;
                 memcpy(fHeader.fDac, fRam.fDac, sizeof(fHeader.fDac));
                 for (int i=0; i<kNumChannels; i++)
@@ -298 +298 @@
             fRam.fRunNumber &= 0xffff;
             fRam.fRunNumber |= fBufCommand[0]<<16;
-            cout << "-> Set RunNumber MSW" << endl;
+            cout << "-> Set RunNumber " << fBoardId << " MSW" << endl;
             break;
         case kCmdWriteRunNumberLSW:
             fRam.fRunNumber &= 0xffff0000;
             fRam.fRunNumber |= fBufCommand[0];
-            cout << "-> Set RunNumber LSW" << endl;
+            cout << "-> Set RunNumber " << fBoardId << " LSW" << endl;
             break;
         case kCmdWriteRoi:
-            cout << "-> Set Roi[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
+            cout << "-> Set " << fBoardId << " Roi[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
             //fChHeader[fCommand[1]].fRegionOfInterest = fBufCommand[0];
             fRamRoi[fCommand[1]] = fBufCommand[0];
@@ -312 +312 @@
 
         case kCmdWriteDac:
-            cout << "-> Set Dac[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
+            cout << "-> Set " << fBoardId << " Dac[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
             fRam.fDac[fCommand[1]] = fBufCommand[0];
             break;
 
         case kCmdWriteRate:
-            cout << "-> Set Rate =" << fBufCommand[0] << endl;
+            cout << "-> Set " << fBoardId << " Rate =" << fBufCommand[0] << endl;
             fHeader.fTriggerGeneratorPrescaler = fBufCommand[0];
             break;