Changeset 11087

Timestamp:

06/21/11 10:34:14 (13 years ago)

Author:

ogrimm

Message:

Command 'boards' accepts 'none' as argument

Location:

fact/FADctrl

Files:

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

fact/FADctrl/FAD.cc

@@ -20 +20 @@
                           const char *Help;
   } CommandList[] = 
-  {{"board", &FAD::cmd_board, false, 1, "[+|-]<range>" ,"Activate or deactivate board(s)"},
+  {{"board", &FAD::cmd_board, true, 1, "<[+|-]range|none>" ,"Activate or deactivate board(s)"},
    {"status", &FAD::cmd_status, false, 0, "[range]", "Show board status information"},
    {"domino", &FAD::cmd_domino, true, 1, "<on|off>", "Switch Domino wave"},
@@ -700 +700 @@
   if (Mode != 0) Parameter[1][0] = ' ';
 
+  // Disable all boards
+  if (Match(Parameter[1], "none")) {
+        for (int i=0; i<(int) Boards.size(); i++) Boards[i]->Active = false;
+        return;
+  }
+
   // Evaluate given range
   if (!ConvertToRange(Parameter[1], R)) {
@@ -1086 +1092 @@
           // Close data file and terminate run
           if(close(Datafile) == -1) Message(ERROR, "Could not close data file (%s)", strerror(errno));
-          else PrintMessage("Data file closed (size %.1f MByte).\n", FileSizeMB);
+          else PrintMessage("Data file closed (size %.1f MByte, %d events).\n", FileSizeMB, NumEvents);
 
           Datafile = -1;

fact/FADctrl/FADBoard.cc

@@ -408 +408 @@
   }
 
-  memset(&PrevStatus, 0, sizeof(PrevStatus));
+  // Use not zero so that comparing Status and PrevStatus at first test will likely show differences
+  memset(&PrevStatus, 0xee, sizeof(PrevStatus));
 
   // Leave loop if program termination requested or board communication not OK

fact/FADctrl/History.txt

@@ -32 +32 @@
 3/6/2011        Raw data files will only contain boards active at the start of the run.
 7/6/2011        DIM event service only contains active boards
+21/6/2011       Command 'boards' takes 'none as argument