Changeset 11374

Timestamp:

07/13/11 14:56:04 (13 years ago)

Author:

tbretz

Message:

Set default run-number to 1; renamed TriggerId to EventCounter

File:

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

trunk/FACT++/src/fad.cc

@@ -55 +55 @@
     // The constructor is prvate to force the obtained pointer to be shared
     tcp_connection(ba::io_service& ioservice, int boardid) : ba::ip::tcp::socket(ioservice),
-        fBoardId(boardid), fTriggerSendData(ioservice)
+        fBoardId(boardid), fRamRoi(kNumChannels), fTriggerSendData(ioservice)
     {
     }
@@ -74 +74 @@
     FAD::ChannelHeader fChHeader[kNumChannels];
 
-    uint16_t fRamRoi[kNumChannels];
+    vector<uint16_t> fRamRoi;
 
     ba::deadline_timer fTriggerSendData;
@@ -232 +232 @@
                 break;
 
-            case kCmdResetTriggerId:
+            case kCmdResetEventCounter:
                 cout << "-> ResetId " << fBoardId << endl;
                 fHeader.fEventCounter = 0;
@@ -346 +346 @@
         fHeader.fVersion = 0x104;
         fHeader.fBoardId = (fBoardId%10) | ((fBoardId/10)<<8);
-        fHeader.fRunNumber = 1;
+        fHeader.fRunNumber = 0;
         fHeader.fDNA = reinterpret_cast<uint64_t>(this);
         fHeader.fTriggerGeneratorPrescaler = 100;