Changeset 11116

Timestamp:

06/22/11 19:56:33 (13 years ago)

Author:

tbretz

Message:

Send commands only to connected boards; disable initial sending of any commands; fixed order of boards and chips in arrays

File:

• trunk/FACT++/src/fadctrl.cc (modified) (8 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -67 +67 @@
             Out() << "ROI|" << fEventHeader.Crate() << ":" << fEventHeader.Board() << ":" << c << ":";
             for (unsigned int ch=0; ch<FAD::kNumChannelsPerChip; ch++)
-                Out() << " " << setw(4) << fChannelHeader[c*FAD::kNumChannelsPerChip+ch].fRegionOfInterest;
+                Out() << " " << setw(4) << fChannelHeader[c+ch*FAD::kNumChips].fRegionOfInterest;
             Out() << endl;
         }
 
-        Out() << "CEL|" << fEventHeader.Crate() << ":" << fEventHeader.Board() << ":";
+        Out() << "CEL|" << fEventHeader.Crate() << ":" <<fEventHeader.Board() << ": ";
         for (unsigned int c=0; c<FAD::kNumChips; c++)
         {
@@ -77 +77 @@
             {
                 for (unsigned int ch=0; ch<FAD::kNumChannelsPerChip; ch++)
-                    Out() << " " << setw(4) << fChannelHeader[c*FAD::kNumChannelsPerChip+ch].fStartCell;
+                    Out() << " " << setw(4) << fChannelHeader[c+ch*FAD::kNumChips].fStartCell;
                 Out() << endl;
             }
@@ -85 +85 @@
                 const uint16_t cel = fChannelHeader[c*FAD::kNumChannelsPerChip].fStartCell;
                 for (unsigned int ch=1; ch<FAD::kNumChannelsPerChip; ch++)
-                    if (cel!=fChannelHeader[c*FAD::kNumChannelsPerChip+ch].fStartCell)
+                    if (cel!=fChannelHeader[c+ch*FAD::kNumChips].fStartCell)
                     {
                         Out() << "!";
@@ -185 +185 @@
             fBuffer.resize(fEventHeader.fPackageLength-sizeof(FAD::EventHeader)/2);
             AsyncRead(ba::buffer(fBuffer), kReadData);
-            AsyncWait(fInTimeout, 500, &Connection::HandleReadTimeout);
+            AsyncWait(fInTimeout, 2000, &Connection::HandleReadTimeout);
 
             return;
@@ -312 +312 @@
 //            CmdSetRoi(i, 100);
 
-        Cmd(FAD::kCmdTriggerLine, true);
-        Cmd(FAD::kCmdSingleTrigger);
+//        Cmd(FAD::kCmdTriggerLine, true);
+//        Cmd(FAD::kCmdSingleTrigger);
     }
 
@@ -319 +319 @@
     void PostCmd(std::vector<uint16_t> cmd)
     {
-        if (fBlockTransmission)
+        if (fBlockTransmission || !IsConnected())
             return;
 
@@ -336 +336 @@
     void PostCmd(uint16_t cmd)
     {
-        if (fBlockTransmission)
+        if (fBlockTransmission || !IsConnected())
             return;
 
@@ -351 +351 @@
     void PostCmd(uint16_t cmd, uint16_t data)
     {
-        if (fBlockTransmission)
+        if (fBlockTransmission || !IsConnected())
             return;