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

Timestamp:

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

Author:

tbretz

Message:

Renamed AddConfiguration and AddTransition to AddEvent

File:

• trunk/FACT++/src/dataLogger.cc (modified) (4 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -590 +590 @@
 
                 /*Add the possible transitions for this machine*/
-                AddTransition(kSM_NightlyOpen, fTransStart, kSM_Ready, kSM_BadNightlyConfig)
+                AddEvent(kSM_NightlyOpen, fTransStart, kSM_Ready, kSM_BadNightlyConfig)
                     (boost::bind(&DataLogger::StartPlease, this))
                     ("Start the nightly logging. Nightly file location must be specified already");
 
-                AddTransition(kSM_Ready, fTransStop, kSM_NightlyOpen, kSM_WaitingRun, kSM_Logging)
+                AddEvent(kSM_Ready, fTransStop, kSM_NightlyOpen, kSM_WaitingRun, kSM_Logging)
                     (boost::bind(&DataLogger::GoToReadyPlease, this))
                     ("Stop all data logging, close all files.");
 
-                AddTransition(kSM_Logging, fTransStartRun, kSM_WaitingRun, kSM_BadRunConfig)
+                AddEvent(kSM_Logging, fTransStartRun, kSM_WaitingRun, kSM_BadRunConfig)
                     (boost::bind(&DataLogger::StartRunPlease, this))
                     ("Start the run logging. Run file location must be specified already.");
 
-                AddTransition(kSM_WaitingRun, fTransStopRun, kSM_Logging)
+                AddEvent(kSM_WaitingRun, fTransStopRun, kSM_Logging)
                     (boost::bind(&DataLogger::StopRunPlease, this))
                     ("Wait for a run to be started, open run-files as soon as a run number arrives.");
 
-                AddTransition(kSM_Ready, fTransReset, kSM_Error, kSM_BadNightlyConfig, kSM_BadRunConfig, kSM_Error)
+                AddEvent(kSM_Ready, fTransReset, kSM_Error, kSM_BadNightlyConfig, kSM_BadRunConfig, kSM_Error)
                     (boost::bind(&DataLogger::GoToReadyPlease, this))
                     ("Transition to exit error states. Closes the nightly file if already opened.");
 
-                AddTransition(kSM_WaitingRun, fTransWait, kSM_NightlyOpen)
+                AddEvent(kSM_WaitingRun, fTransWait, kSM_NightlyOpen)
                     (boost::bind(&DataLogger::NightlyToWaitRunPlease, this));
 
                 /*Add the possible configurations for this machine*/
-                AddConfiguration(fConfigDay, "C", kSM_Ready, kSM_BadNightlyConfig)
+                AddEvent(fConfigDay, "C", kSM_Ready, kSM_BadNightlyConfig)
                     (boost::bind(&DataLogger::ConfigureNightlyFileName, this, _1))
                     ("Configure the folder for the nightly files."
                      "|Path[string]:Absolute or relative path name where the nightly files should be stored.");
 
-                AddConfiguration(fConfigRun, "C", kSM_Ready, kSM_BadNightlyConfig, kSM_NightlyOpen, kSM_WaitingRun, kSM_BadRunConfig)
+                AddEvent(fConfigRun, "C", kSM_Ready, kSM_BadNightlyConfig, kSM_NightlyOpen, kSM_WaitingRun, kSM_BadRunConfig)
                     (boost::bind(&DataLogger::ConfigureRunFileName, this, _1))
                     ("Configure the folder for the run files."
                      "|Path[string]:Absolute or relative path name where the run files should be stored.");
 
-                AddConfiguration(fConfigRunNumber, "I", kSM_Ready, kSM_BadNightlyConfig, kSM_NightlyOpen, kSM_WaitingRun, kSM_BadRunConfig)
+                AddEvent(fConfigRunNumber, "I", kSM_Ready, kSM_BadNightlyConfig, kSM_NightlyOpen, kSM_WaitingRun, kSM_BadRunConfig)
                     (boost::bind(&DataLogger::ConfigureRunNumber, this, _1))
                     ("configure the run number. cannot be done in logging state");
@@ -633 +633 @@
                 //is already done in StateMachineImp.cc
                 //Thus I'll simply add a configuration, which I will treat as the logging command
-                AddConfiguration(fConfigLog, "C", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_BadRunConfig)
+                AddEvent(fConfigLog, "C", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_BadRunConfig)
                     (boost::bind(&DataLogger::LogMessagePlease, this, _1))
                     ("Log a single message to the log-files."
@@ -643 +643 @@
                 str << " " << kSM_BadRunConfig;
 
-                                AddConfiguration(fPrintCommand, str.str().c_str(), "")
-//                AddConfiguration(fPrintCommand, kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_BadNightlyConfig, kSM_BadRunConfig)
+                                AddEvent(fPrintCommand, str.str().c_str(), "")
+//                AddEvent(fPrintCommand, kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_BadNightlyConfig, kSM_BadRunConfig)
                     (boost::bind(&DataLogger::PrintStatePlease, this, _1))
                     ("Print information about the internal status of the data logger.");
@@ -688 +688 @@
 
                 //provide services control commands
-                AddConfiguration(fDebugOnOff, "B:1", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
+                AddEvent(fDebugOnOff, "B:1", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
                     (boost::bind(&DataLogger::SetDebugOnOff, this, _1))
                     ("Switch debug mode on off. Debug mode prints ifnormation about every service written to a file."
                      "|Enable[bool]:Enable of disable debuig mode (yes/no).");
 
-                AddConfiguration(fStatsPeriod, "F", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
+                AddEvent(fStatsPeriod, "F", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
                     (boost::bind(&DataLogger::SetStatsPeriod, this, _1))
                     ("Interval in which the data-logger statitistics service (STATS) is updated."
                      "Interval[s]:Floating point value in seconds.");
 
-                AddConfiguration(fStartStopOpenedFiles, "B:1", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
+                AddEvent(fStartStopOpenedFiles, "B:1", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
                     (boost::bind(&DataLogger::SetOpenedFilesOnOff ,this, _1))
                     ("Can be used to switch the service off which distributes information about the open files.");
 
-                AddConfiguration(fStartStopNumSubsAndFits, "B:1", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
+                AddEvent(fStartStopNumSubsAndFits, "B:1", kSM_NightlyOpen, kSM_Logging, kSM_WaitingRun, kSM_Ready)
                     (boost::bind(&DataLogger::SetNumSubsAndFitsOnOff, this, _1))
                     ("Can be used to switch the service off which distributes information about the number of subscriptions and open files.");