Index: /trunk/FACT++/src/dataLogger.cc
===================================================================
--- /trunk/FACT++/src/dataLogger.cc	(revision 10291)
+++ /trunk/FACT++/src/dataLogger.cc	(revision 10292)
@@ -290,23 +290,37 @@
 		AddStateName(kSM_BadRunConfig,   "ErrRunFolder");
 
-		/*Add the possible transitions for this machine*/
-		AddTransition(kSM_DailyOpen, fTransStart, kSM_Ready, kSM_BadDailyConfig) //start the daily logging. daily file location must be specified already
-			->AssignFunction(boost::bind(&DataLogger::StartPlease, this)); 
-		AddTransition(kSM_Ready, fTransStop, kSM_DailyOpen, kSM_WaitingRun, kSM_Logging) //stop the data logging
-			->AssignFunction(boost::bind(&DataLogger::GoToReadyPlease, this));
-		AddTransition(kSM_Logging, fTransStartRun, kSM_WaitingRun, kSM_BadRunConfig) //start the run logging. run file location must be specified already.
-			->AssignFunction(boost::bind(&DataLogger::StartRunPlease, this));
-		AddTransition(kSM_WaitingRun, fTransStopRun, kSM_Logging)
-			->AssignFunction(boost::bind(&DataLogger::StopRunPlease, this));
-		AddTransition(kSM_Ready, fTransReset, kSM_Error, kSM_BadDailyConfig, kSM_BadRunConfig, kSM_Error) //transition to exit error states. dunno if required or not, would close the daily file if already openned.
-			->AssignFunction(boost::bind(&DataLogger::GoToReadyPlease, this));
-		AddTransition(kSM_WaitingRun, fTransWait, kSM_DailyOpen)
-			->AssignFunction(boost::bind(&DataLogger::DailyToWaitRunPlease, this));
-		/*Add the possible configurations for this machine*/
-		AddConfiguration(fConfigDay, "C", kSM_Ready, kSM_BadDailyConfig) //configure the daily file location. cannot be done before the file is actually opened
-			->AssignFunction(boost::bind(&DataLogger::ConfigureDailyFileName, this, _1));
-		AddConfiguration(fConfigRun, "C", kSM_Ready, kSM_BadDailyConfig, kSM_DailyOpen, kSM_WaitingRun, kSM_BadRunConfig) //configure the run file location. cannot be done before the file is actually opened, and not in a dailly related error.
-			->AssignFunction(boost::bind(&DataLogger::ConfigureRunFileName, this, _1));
-		
+                /*Add the possible transitions for this machine*/
+
+                //start the daily logging. daily file location must be specified already
+		AddTransition(kSM_DailyOpen, fTransStart, kSM_Ready, kSM_BadDailyConfig). 
+                    AssignFunction(boost::bind(&DataLogger::StartPlease, this));
+
+                //stop the data logging
+		AddTransition(kSM_Ready, fTransStop, kSM_DailyOpen, kSM_WaitingRun, kSM_Logging). 
+                    AssignFunction(boost::bind(&DataLogger::GoToReadyPlease, this));
+
+                //start the run logging. run file location must be specified already.
+                AddTransition(kSM_Logging, fTransStartRun, kSM_WaitingRun, kSM_BadRunConfig).
+                    AssignFunction(boost::bind(&DataLogger::StartRunPlease, this));
+
+                AddTransition(kSM_WaitingRun, fTransStopRun, kSM_Logging).
+                    AssignFunction(boost::bind(&DataLogger::StopRunPlease, this));
+
+                 //transition to exit error states. dunno if required or not, would close the daily file if already openned.
+		AddTransition(kSM_Ready, fTransReset, kSM_Error, kSM_BadDailyConfig, kSM_BadRunConfig, kSM_Error).
+                    AssignFunction(boost::bind(&DataLogger::GoToReadyPlease, this));
+
+                AddTransition(kSM_WaitingRun, fTransWait, kSM_DailyOpen).
+                    AssignFunction(boost::bind(&DataLogger::DailyToWaitRunPlease, this));
+
+                /*Add the possible configurations for this machine*/
+                //configure the daily file location. cannot be done before the file is actually opened
+		AddConfiguration(fConfigDay, "C", kSM_Ready, kSM_BadDailyConfig).
+                    AssignFunction(boost::bind(&DataLogger::ConfigureDailyFileName, this, _1));
+
+                 //configure the run file location. cannot be done before the file is actually opened, and not in a dailly related error.
+		AddConfiguration(fConfigRun, "C", kSM_Ready, kSM_BadDailyConfig, kSM_DailyOpen, kSM_WaitingRun, kSM_BadRunConfig).
+                    AssignFunction(boost::bind(&DataLogger::ConfigureRunFileName, this, _1));
+
 		//Provide a logging command
 		//I get the feeling that I should be going through the EventImp 
@@ -314,7 +328,7 @@
 		//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_DailyOpen, kSM_Logging, kSM_WaitingRun, kSM_BadRunConfig)
-			->AssignFunction(boost::bind(&DataLogger::LogMessagePlease, this, _1));
-		
+		AddConfiguration(fConfigLog, "C", kSM_DailyOpen, kSM_Logging, kSM_WaitingRun, kSM_BadRunConfig).
+                    AssignFunction(boost::bind(&DataLogger::LogMessagePlease, this, _1));
+
 		fServiceList.SetHandler(this);
 		CheckForServicesUpdate();
Index: /trunk/FACT++/src/dclient5.cc
===================================================================
--- /trunk/FACT++/src/dclient5.cc	(revision 10291)
+++ /trunk/FACT++/src/dclient5.cc	(revision 10292)
@@ -249,6 +249,6 @@
         AddStateName(kSM_Stopping,      "Stopping");
 
-        AddTransition(kSM_Running,   "START", kSM_Connected)
-            ->AssignFunction(boost::bind(&StateMachineFAD::Start, this, _1, 5));
+        AddTransition(kSM_Running,   "START", kSM_Connected).
+            AssignFunction(boost::bind(&StateMachineFAD::Start, this, _1, 5));
         AddTransition(kSM_Connected, "STOP",  kSM_Running);
 
@@ -261,6 +261,6 @@
         T::AddConfiguration("TESTIC",   "I:2;C");
 
-        T::AddConfiguration("CMD", "C")
-            ->AssignFunction(boost::bind(&StateMachineFAD::Command, this, _1));
+        T::AddConfiguration("CMD", "C").
+            AssignFunction(boost::bind(&StateMachineFAD::Command, this, _1));
 
         AddTransition(kSM_Reconnect, "RECONNECT");