Changeset 10261

Timestamp:

03/28/11 13:06:34 (14 years ago)

Author:

ogrimm

Message:

Boards with communication error are set inactive

Location:

fact/FADctrl

Files:

• FAD.cc (modified) (1 diff)
• FADBoard.cc (modified) (3 diffs)
• History.txt (modified) (1 diff)

fact/FADctrl/FAD.cc

@@ -907 +907 @@
           for (unsigned int i=0; i<Boards.size(); i++) {
                 if (IDString.find(string("ACALIBDONE")+Boards[i]->Name) != string::npos) AcalibDone[i] = true;
-                if (!AcalibDone[i] && Boards[i]->Active && Boards[i]->CommOK) Done = false;
+                if (!AcalibDone[i] && Boards[i]->Active) Done = false;
           }
           // Amplitude calibration finished?

fact/FADctrl/FADBoard.cc

@@ -17 +17 @@
   // Initialization
   m = Parent;
-  Active = true;
+  Active = false;
   Continue = true;
   CommOK = false;
@@ -367 +367 @@
     m->PrintMessage("Could not connect to %s at port %d (%s)\n", Name, Port, strerror(errno));
   }
-  else CommOK = true;
+  else {
+        CommOK = true;
+        Active = true;
+  }
+
   memset(&PrevStatus, 0, sizeof(PrevStatus));
 
@@ -524 +528 @@
   } // while()
   
-  // Close socket descriptor
+  // Set inactive and close socket descriptor
+  Active = false;
+
   if (close(Socket) == -1) {
         m->PrintMessage("Could not close socket descriptor for board %s (%s)", Name, strerror(errno));  

fact/FADctrl/History.txt

@@ -17 +17 @@
 1/3/2011        Board list can be passed via command line
 2/3/2011        Implemented new FAD data format
+28/3/2011       Boards with communication error set themselves inactive