Changeset 11421

Timestamp:

07/15/11 15:24:32 (13 years ago)

Author:

tbretz

Message:

Fall back from configured to connected as soon as the corresponding run has been opened.

File:

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

trunk/FACT++/src/fadctrl.cc

@@ -1415 +1415 @@
         if (nconnecting1==0 && nconnected1>0 && nconnected2==nconnected1)
         {
+            if (T::GetCurrentState()==FAD::kConfigured && IsRunStarted(GetRunNumber()-1))
+                return FAD::kConnected;
+
             if (nconfigured!=nconnected1)
             {
+
                 if (T::GetCurrentState()==FAD::kConfiguring ||
                     T::GetCurrentState()==FAD::kConfigured)
@@ -1426 +1430 @@
             }
 
-            if (T::GetCurrentState() != FAD::kConfiguring &&
-                T::GetCurrentState() != FAD::kConfigured)
-                return FAD::kConnected;
-
-            if (T::GetCurrentState()== FAD::kConfiguring)
+            if (T::GetCurrentState()==FAD::kConfiguring)
             {
                 for (BoardList::iterator it=fBoards.begin(); it!=fBoards.end(); it++)
@@ -1445 +1445 @@
                     //        successfully enabled the trigger lines?
                 }
-            }
-            return FAD::kConfigured;
+                return FAD::kConfigured;
+            }
+
+            return FAD::kConnected;
         }
 
@@ -1853 +1855 @@
 
             target.fTriggerRate = 0;
-            if (target.fContinousTrigger)
+            //if (target.fContinousTrigger)
             {
                 if (!CheckConfigVal<uint16_t>(conf, 0xffff, "trigger-rate.", *it))