Changeset 10617 for fact/FADctrl

Timestamp:

05/06/11 13:16:22 (14 years ago)

Author:

ogrimm

Message:

New FAD event format implemented

Location:

fact/FADctrl

Files:

• FAD.cc (modified) (6 diffs)
• FAD.h (modified) (2 diffs)
• History.txt (modified) (1 diff)

fact/FADctrl/FAD.cc

@@ -28 +28 @@
    {"sclk", &FAD::cmd_sclk, true, 1, "<on|off>", "Set SCLK"},
    {"trigger", &FAD::cmd_trigger, false, 0, "[n|cont [rate]|stop|enable|disable]", "Issue software triggers"},
-   {"reset_trigger", &FAD::cmd_reset_trigger, false, 0, "resets the internal trigger counter"},
-   {"set_runnumber", &FAD::cmd_set_runnumber, false, 1, "<n> sets runnumber"},
+   {"reset_trigger", &FAD::cmd_reset_trigger, true, 0, "", "Reset internal trigger counter"},
+   {"runnumber", &FAD::cmd_runnumber, true, 1, "<n>", "Set runnumber"},
    {"roi", &FAD::cmd_roi, true, 2, "<channel range> <value>", "Set region-of-interest to value"},
    {"dac", &FAD::cmd_dac, true, 2, "<range> <value>", "Set DAC numbers in range to value"},
@@ -41 +41 @@
    {"stop", &FAD::cmd_stop, false, 0, "", "Stop current operation/run"},
    {"update", &FAD::cmd_update, false, 1, "<sec>", "Minimum delay between updates to DIM event service"},                 
-   {"socketmode", &FAD::cmd_socketmode, true, 1, "<com|daq>", "Choose which Sockets are used for data transmission"},
-   {"daqmode", &FAD::cmd_daqmode, true, 1, "<start|stop>", "Set FAD DAQ mode. when started, no configurations must be send."},                            
-   {"reconnect", &FAD::cmd_reconnect, true, 1, "<board range> [init]", "Reconnect to boards (and re-initialise)"},                
+   {"socketmode", &FAD::cmd_socketmode, true, 1, "<com|daq>", "Choose which Sockets are used for data transmission"},                     
    {"exit", &FAD::cmd_exit, false, 0, "", "Exit program"},
    {"help", &FAD::cmd_help, false, 0, "", "Print help"}};
@@ -197 +195 @@
 } 
 
+//
+// Reset internal trigger
+//
+
 void FAD::cmd_reset_trigger() {
-  for (unsigned int i=0; i<Boards.size(); i++) {
-        Boards[i]->Send(CMD_RESET_TRIGGER_ID);
-  }
-}
-
-
-void FAD::cmd_set_runnumber() {
+
+  for (unsigned int i=0; i<Boards.size(); i++) Boards[i]->Send(CMD_RESET_TRIGGER_ID);
+}
+
+//
+// Set run number
+//
+void FAD::cmd_runnumber() {
+
   int Num;
 
-  if (Parameter.size() == 2) {
-                ConvertToInt(Parameter[1], &Num);
-          for (unsigned int i=0; i<Boards.size(); i++) {
-                        Boards[i]->Send( CMD_Write | ADDR_RUNNUMBER );
-                        Boards[i]->Send((unsigned short) Num>>16);              // Write the HIGH-word first
-                        Boards[i]->Send( CMD_Write | (ADDR_RUNNUMBER+1) );
-                        Boards[i]->Send((unsigned short) (Num>>16)<<16); // now write the LOW-word
-                }
-        }
-        else {
-          PrintUsage();
-          return;
-        }
-}
-  
-
+  if (!ConvertToInt(Parameter[1], &Num)) {
+        PrintMessage("Error, incorrect parameter for run number\n");
+        return;
+  }
+
+  for (unsigned int i=0; i<Boards.size(); i++) {
+        Boards[i]->Send(CMD_Write | ADDR_RUNNUMBER );
+        Boards[i]->Send((unsigned short) (Num>>16));            // Write the HIGH-word first
+        Boards[i]->Send(CMD_Write | (ADDR_RUNNUMBER+1) );
+        Boards[i]->Send((unsigned short) Num); // now write the LOW-word
+  }
+}
+  
 //
 // Switch socket mode
@@ -241 +242 @@
   }
 } 
-
-//
-// Set DAQ mode
-// "start" - DAQ started, no configurations may be issued
-// "stop" - DAQ stopped, configurations may be issued
-// 
-//      Note that socket 0 is always used to issue commands
-//
-void FAD::cmd_daqmode() {
-
-  for (unsigned int i=0; i<Boards.size(); i++) {
-        if (Match(Parameter[1],"start")) Boards[i]->Send(CMD_Start);
-        else if (Match(Parameter[1],"stop")) Boards[i]->Send(CMD_Stop);
-        else {
-          PrintUsage();
-          return;
-        }
-  }
-} 
-
 
 //
@@ -671 +652 @@
           PrintMessage("%4d ", S.ROI[j/NChannels][j%NChannels]);
         }
-        PrintMessage("\n");
+        
+        PrintMessage("\nLast trigger: ID %d    Type %d   CRC %d     Run number %d\n", S.TriggerID, S.TriggerType, S.TriggerCRC, S.Runnumber);
   } // for()
 }
@@ -704 +686 @@
         }
   }  
-} 
-
-//
-// Reconnect to boards
-//
-void FAD::cmd_reconnect() {
-
-  struct Range R = {0, Boards.size()};
-
-  // Check ranges  
-  if (!ConvertToRange(Parameter[1], R)) {
-        PrintMessage("Error, board number(s) out of range\n");
-        return;
-  }
-  PrintMessage("Note: Currently not protection against concurrent access in EventThread\n");
-  
-  // Reinstantiate boards
-  for (int i=0; i<(int) Boards.size(); i++) if (i >= R.Min && i <= R.Max) {
-        if (pthread_kill(Boards[i]->Thread, 0) != ESRCH) {
-          PrintMessage("Event thread of board %d still running, cannot reconnect\n", i);
-          continue;
-        }
-
-        delete Boards[i];
-    Boards[i] = new class FADBoard(BoardList[i], PORT, this, i);
-  }
-  
-  // Initialise boards if requested (use sendCommandNB() to avoid dead lock) 
-  if (Parameter.size() != 3 || !Match(Parameter[2], "init")) return;
-   
-  vector<string> Init = Tokenize(GetConfig("InitSequence"), ";");
-
-  for (unsigned int i=0; i<Init.size(); i++) {
-        DimClient::sendCommandNB(SERVER_NAME"/Command", (char *) Init[i].c_str());
-  }
 } 
 

fact/FADctrl/FAD.h

@@ -70 +70 @@
         void cmd_acalib();              void cmd_serial();
         void cmd_trigger(); 
-        void cmd_reset_trigger();
-        void cmd_set_runnumber();       
-void cmd_socketmode();void cmd_daqmode();  
+        void cmd_runnumber();   void cmd_reset_trigger();
+        void cmd_socketmode();
         void cmd_srclk();               void cmd_sclk();
         void cmd_dwrite();              void cmd_domino();
@@ -80 +79 @@
         void cmd_phase();               void cmd_send();
         void cmd_stop();                void cmd_update();
-        void cmd_take();                void cmd_reconnect();
+        void cmd_take();
 
     void EnableDomino();

fact/FADctrl/History.txt

@@ -23 +23 @@
 5/4/2011        Added DIM rate service for each board
 6/4/2011        Bug fix in internal pipe communication  
+4/5/2011        Removed 'daqmode' (had no function). Added 'reset_trigger' and 'runnumber' commands.
+                        Event format adapted (ADC data not sent in network byte order anymore).