Changeset 12336 for trunk

Timestamp:

10/30/11 22:38:19 (13 years ago)

Author:

tbretz

Message:

For the time being go back to idle when a new run was successfully started.

File:

• trunk/FACT++/src/mcp.cc (modified) (3 diffs)

trunk/FACT++/src/mcp.cc

@@ -56 +56 @@
         kStateConfiguring3,
         kStateConfigured,
+//        kStateRunInProgress,
     };
 
@@ -174 +175 @@
     int StopRun(const EventImp &)
     {
-        if (fStatusFTM.second==FTM::kTakingData)
+        if (fStatusFTM.second==FTM::kTriggerOn)
         {
             Message("Stopping FTM");
@@ -324 +325 @@
 
             if (GetCurrentState()==kStateConfigured)
-                return GetCurrentState();
+            {
+                if (fStatusFTM.second != FTM::kTriggerOn)
+                    return GetCurrentState();
+
+                // Now we are taking data... we could now wait for
+                // the fad to go back to -1
+            }
 
             return kStateIdle;