Changeset 16444

Timestamp:

05/30/13 00:17:24 (11 years ago)

Author:

tbretz

Message:

First send the command to the FTM then the Dim message; change the message in state configured if the configuration is updated.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -516 +516 @@
     void CmdStartRun()
     {
+        PostCmd(FTM::kCmdStartRun, FTM::kStartRun);
+        CmdGetRegister(0);
+
         Info("Sending start trigger.");
-
-        PostCmd(FTM::kCmdStartRun, FTM::kStartRun);
-
-        // Update state information by requesting a new header
+    }
+
+    void CmdStopRun()
+    {
+        PostCmd(FTM::kCmdStopRun);
         CmdGetRegister(0);
-    }
-
-    void CmdStopRun()
-    {
+
         Info("Sending stop trigger.");
-
-        PostCmd(FTM::kCmdStopRun);
-
-        // Update state information by requesting a new header
-        CmdGetRegister(0);
     }
 
@@ -576 +572 @@
             return false;
 
+        PostCmd(FTM::kCmdCrateReset, 1<<addr);
         Info("Sending crate reset for crate "+to_string(addr));
-        PostCmd(FTM::kCmdCrateReset, 1<<addr);
 
         return true;
@@ -584 +580 @@
     bool CmdResetCamera()
     {
-        Info("Sending camera reset");
-
         PostCmd(FTM::kCmdCrateReset, FTM::kResetCrate0);
         PostCmd(FTM::kCmdCrateReset, FTM::kResetCrate1);
         PostCmd(FTM::kCmdCrateReset, FTM::kResetCrate2);
         PostCmd(FTM::kCmdCrateReset, FTM::kResetCrate3);
+
+        Info("Sending camera reset");
 
         return true;
@@ -1972 +1968 @@
             fCounterStat = fFTM.GetCounter(FTM::kStaticData);
 
+            fFTM.CmdSendStatDat(fTargetConfig->second);
+
             T::Message("Trigger successfully disabled... sending new configuration.");
-
-            fFTM.CmdSendStatDat(fTargetConfig->second);
 
             // Next state is: wait for the answer to our configuration
@@ -1988 +1984 @@
             // If now the configuration is not what we expected
             // we had an error (maybe old events waiting in the queue?)
-            // ======================
             if (fFTM.GetState()!=ConnectionFTM::kConfigured)
                 return FTM::State::kConfigError2;
-            // ======================
-            // There is no simple way to check if the clock
-            // conditioner is locked. Every message send to request a static
-            // data block may end up in the same buffer at the FTM, thus
-            // the result will be that it is in state Configuring, which
-            // will always return the clock conditioner to be unlocked.
-            /*
-            if (!fFTM.IsLocked())
-            {
-                 T::Warn("Configuration successfull, but clock conditioner not locked.");
-                 return FTM::State::kConfigError3;
-            }*/
-            // ======================
 
             // Check configuration again when a new static data block
@@ -2009 +1991 @@
             fCounterStat = fFTM.GetCounter(FTM::kStaticData);
 
-            // T::Info(" ==> TODO: Update run in database!");
-            T::Message("Sending new configuration was successfull.");
+            // This is also displayed when the ratecontrol sends its configuration...
+            if (T::GetCurrentState()==FTM::State::kConfiguring2)
+                T::Message("Sending new configuration was successfull.");
+            else
+                T::Message("Configuration successfull updated.");
 
             // Next state is: wait for the answer to our configuration