Changeset 10688 for trunk/FACT++/src/ftmctrl.cc

Timestamp:

05/12/11 21:52:22 (14 years ago)

Author:

tbretz

Message:

Renamed AddConfiguration and AddTransition to AddEvent

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (11 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -1401 +1401 @@
 
         // FTM Commands
-        AddConfiguration("TOGGLE_LED", kStateIdle)
+        AddEvent("TOGGLE_LED", kStateIdle)
             (Wrapper(boost::bind(&ConnectionFTM::CmdToggleLed, &fFTM)))
             ("toggle led");
 
-        AddConfiguration("PING", kStateIdle)
+        AddEvent("PING", kStateIdle)
             (Wrapper(boost::bind(&ConnectionFTM::CmdPing, &fFTM)))
             ("send ping");
 
-        AddConfiguration("REQUEST_DYNAMIC_DATA", kStateIdle)
+        AddEvent("REQUEST_DYNAMIC_DATA", kStateIdle)
             (Wrapper(boost::bind(&ConnectionFTM::CmdReqDynDat, &fFTM)))
             ("request transmission of dynamic data block");
 
-        AddConfiguration("REQUEST_STATIC_DATA", kStateIdle)
+        AddEvent("REQUEST_STATIC_DATA", kStateIdle)
             (Wrapper(boost::bind(&ConnectionFTM::CmdReqStatDat, &fFTM)))
             ("request transmission of static data from FTM to memory");
 
-        AddConfiguration("GET_REGISTER", "I", kStateIdle)
+        AddEvent("GET_REGISTER", "I", kStateIdle)
             (boost::bind(&StateMachineFTM::GetRegister, this, _1))
             ("read register from address addr"
             "|addr[short]:Address of register");
 
-        AddConfiguration("SET_REGISTER", "I:2", kStateIdle)
+        AddEvent("SET_REGISTER", "I:2", kStateIdle)
             (boost::bind(&StateMachineFTM::SetRegister, this, _1))
             ("set register to value"
@@ -1428 +1428 @@
             "|val[short]:Value to be set");
 
-        AddConfiguration("START_RUN", kStateIdle)
+        AddEvent("START_RUN", kStateIdle)
             (Wrapper(boost::bind(&ConnectionFTM::CmdStartRun, &fFTM)))
             ("start a run (start distributing triggers)");
 
-        AddConfiguration("STOP_RUN", kStateTakingData)
+        AddEvent("STOP_RUN", kStateTakingData)
             (Wrapper(boost::bind(&ConnectionFTM::CmdStopRun, &fFTM)))
             ("stop a run (stop distributing triggers)");
 
-        AddConfiguration("TAKE_N_EVENTS", "I", kStateIdle)
+        AddEvent("TAKE_N_EVENTS", "I", kStateIdle)
             (boost::bind(&StateMachineFTM::TakeNevents, this, _1))
             ("take n events (distribute n triggers)|number[int]:Number of events to be taken");
 
-        AddConfiguration("DISABLE_REPORTS", "B", kStateIdle)
+        AddEvent("DISABLE_REPORTS", "B", kStateIdle)
             (boost::bind(&StateMachineFTM::DisableReports, this, _1))
             ("disable sending rate reports"
              "|status[bool]:disable or enable that the FTM sends rate reports (yes/no)");
 
-        AddConfiguration("SET_THRESHOLD", "I:2", kStateIdle)
+        AddEvent("SET_THRESHOLD", "I:2", kStateIdle)
             (boost::bind(&StateMachineFTM::SetThreshold, this, _1))
             ("Set the comparator threshold"
@@ -1451 +1451 @@
              "|Threshold[counts]:Threshold to be set in binary counts");
 
-        AddConfiguration("SET_PRESCALING", "I:1", kStateIdle)
+        AddEvent("SET_PRESCALING", "I:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetPrescaling, this, _1))
             (""
              "|[]:");
 
-        AddConfiguration("ENABLE_FTU", "I:1;B:1", kStateIdle)
+        AddEvent("ENABLE_FTU", "I:1;B:1", kStateIdle)
             (boost::bind(&StateMachineFTM::EnableFTU, this, _1))
             ("Enable or disable FTU"
@@ -1462 +1462 @@
              "|Enable[bool]:Whether FTU should be enabled or disabled (yes/no)");
 
-        AddConfiguration("TOGGLE_FTU", "I:1", kStateIdle)
+        AddEvent("TOGGLE_FTU", "I:1", kStateIdle)
             (boost::bind(&StateMachineFTM::ToggleFTU, this, _1))
             ("Toggle status of FTU (this is mainly meant to be used in the GUI)"
              "|Board[idx]:Index of the board (0-39)");
 
-        AddConfiguration("SET_TRIGGER_INTERVAL", "I:1", kStateIdle)
+        AddEvent("SET_TRIGGER_INTERVAL", "I:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerInterval, this, _1))
             ("Sets the trigger interval which is the distance between two consecutive artificial triggers."
              "|interval[int]:The applied trigger interval is: interval*4ns+8ns");
 
-        AddConfiguration("SET_TRIGGER_DELAY", "I:1", kStateIdle)
+        AddEvent("SET_TRIGGER_DELAY", "I:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerDelay, this, _1))
             (""
              "|delay[int]:The applied trigger delay is: delay*4ns+8ns");
 
-        AddConfiguration("SET_TIME_MARKER_DELAY", "I:1", kStateIdle)
+        AddEvent("SET_TIME_MARKER_DELAY", "I:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTimeMarkerDelay, this, _1))
             (""
             "|delay[int]:The applied time marker delay is: delay*4ns+8ns");
 
-        AddConfiguration("SET_DEAD_TIME", "I:1", kStateIdle)
+        AddEvent("SET_DEAD_TIME", "I:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetDeadTime, this, _1))
             (""
             "|dead_time[int]:The applied dead time is: dead_time*4ns+8ns");
 
-        AddConfiguration("ENABLE_TRIGGER", "B:1", kStateIdle)
+        AddEvent("ENABLE_TRIGGER", "B:1", kStateIdle)
             (boost::bind(&StateMachineFTM::Enable, this, _1, FTM::StaticData::kTrigger))
             ("Switch on the physics trigger"
@@ -1493 +1493 @@
 
         // FIXME: Switch on/off depending on sequence
-        AddConfiguration("ENABLE_EXT1", "B:1", kStateIdle)
+        AddEvent("ENABLE_EXT1", "B:1", kStateIdle)
             (boost::bind(&StateMachineFTM::Enable, this, _1, FTM::StaticData::kExt1))
             ("Switch on the triggers through the first external line"
@@ -1499 +1499 @@
 
         // FIXME: Switch on/off depending on sequence
-        AddConfiguration("ENABLE_EXT2", "B:1", kStateIdle)
+        AddEvent("ENABLE_EXT2", "B:1", kStateIdle)
             (boost::bind(&StateMachineFTM::Enable, this, _1, FTM::StaticData::kExt2))
             ("Switch on the triggers through the second external line"
              "|Enable[bool]:Enable ext2 trigger (yes/no)");
 
-        AddConfiguration("ENABLE_VETO", "B:1", kStateIdle)
+        AddEvent("ENABLE_VETO", "B:1", kStateIdle)
             (boost::bind(&StateMachineFTM::Enable, this, _1, FTM::StaticData::kVeto))
             ("Enable veto line"
              "|Enable[bool]:Enable veto (yes/no)");
 
-        AddConfiguration("SET_TRIGGER_SEQUENCE", "C:3", kStateIdle)
+        AddEvent("SET_TRIGGER_SEQUENCE", "C:3", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerSeq, this, _1))
             ("Setup the sequence of artificial triggers produced by the FTM"
@@ -1516 +1516 @@
              "|LPext[int]:number of triggers of the external light pulser");
 
-        AddConfiguration("SET_TRIGGER_COINCIDENCE", "S:1", kStateIdle)
+        AddEvent("SET_TRIGGER_COINCIDENCE", "S:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerCoincidence, this, _1))
             ("Setup the coincidence condition for physcis triggers"
              "|N[int]:Number of requirered coincident triggers from sum-patches (1-40)");
 
-        AddConfiguration("SET_TRIGGER_WINDOW", "S:1", kStateIdle)
+        AddEvent("SET_TRIGGER_WINDOW", "S:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerWindow, this, _1))
             ("");
 
-        AddConfiguration("SET_CALIBRATION_COINCIDENCE", "S:1", kStateIdle)
+        AddEvent("SET_CALIBRATION_COINCIDENCE", "S:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetCalibCoincidence, this, _1))
             ("Setup the coincidence condition for artificial (calibration) triggers"
              "|N[int]:Number of requirered coincident triggers from sum-patches (1-40)");
 
-        AddConfiguration("SET_CALIBRATION_WINDOW", "S:1", kStateIdle)
+        AddEvent("SET_CALIBRATION_WINDOW", "S:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetCalibWindow, this, _1))
             ("");
@@ -1536 +1536 @@
 
         // Load/save static data block
-        T::AddConfiguration("SAVE", "C", kStateIdle)
+        T::AddEvent("SAVE", "C", kStateIdle)
             (boost::bind(&StateMachineFTM::SaveStaticData, this, _1))
             ("Saves the static data (FTM configuration) from memory to a file"
              "|filename[string]:Filename (can include a path), .bin is automatically added");
 
-        T::AddConfiguration("LOAD", "C", kStateIdle)
+        T::AddEvent("LOAD", "C", kStateIdle)
             (boost::bind(&StateMachineFTM::LoadStaticData, this, _1))
             ("Loads the static data (FTM configuration) from a file into memory and sends it to the FTM"
@@ -1549 +1549 @@
 
         // Verbosity commands
-        T::AddConfiguration("SET_VERBOSE", "B")
+        T::AddEvent("SET_VERBOSE", "B")
             (boost::bind(&StateMachineFTM::SetVerbosity, this, _1))
             ("set verbosity state"
              "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data");
 
-        T::AddConfiguration("SET_HEX_OUTPUT", "B")
+        T::AddEvent("SET_HEX_OUTPUT", "B")
             (boost::bind(&StateMachineFTM::SetHexOutput, this, _1))
             ("enable or disable hex output for received data"
              "|hexout[bool]:disable or enable hex output for received data (yes/no)");
 
-        T::AddConfiguration("SET_DYNAMIC_OUTPUT", "B")
+        T::AddEvent("SET_DYNAMIC_OUTPUT", "B")
             (boost::bind(&StateMachineFTM::SetDynamicOut, this, _1))
             ("enable or disable output for received dynamic data (data is still broadcasted via Dim)"
@@ -1566 +1566 @@
 
         // Conenction commands
-        AddConfiguration("DISCONNECT", kStateConnected, kStateIdle)
+        AddEvent("DISCONNECT", kStateConnected, kStateIdle)
             (boost::bind(&StateMachineFTM::Disconnect, this))
             ("disconnect from ethernet");
 
-        AddConfiguration("RECONNECT", "O", kStateDisconnected, kStateConnected, kStateIdle)
+        AddEvent("RECONNECT", "O", kStateDisconnected, kStateConnected, kStateIdle)
             (boost::bind(&StateMachineFTM::Reconnect, this, _1))
             ("(Re)connect ethernet connection to FTM, a new address can be given"
@@ -1576 +1576 @@
 
         // Other
-        AddTransition(kCmdTest, "TEST", "O")
+        AddEvent(kCmdTest, "TEST", "O")
             (boost::bind(&StateMachineFTM::Test, this, _1))
             ("Just for test purpose, do not use");