Changeset 15157 for trunk

Timestamp:

03/26/13 17:18:41 (12 years ago)

Author:

tbretz

Message:

Fixed a problem which could cause the fadctrl after a successsfull configuration to go first to WritingData (old file still open), Connected (old file closed) and WritingData again (new file open). Now it will only go to WritingData when the new file has been opened.

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (1 diff)
• fadctrl.cc (modified) (2 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -1069 +1069 @@
     }
 
+    bool IsRunFileOpen()
+    {
+        return fLastOpened==fRunNumber-1;
+    }
+
     bool IncreaseRunNumber(uint32_t run)
     {

trunk/FACT++/src/fadctrl.cc

@@ -1593 +1593 @@
             }
 
-            return GetNumFilesOpen()>0 ? FAD::State::kWritingData : FAD::State::kConnected;
+            return GetNumFilesOpen()>0 && IsRunFileOpen() ? FAD::State::kWritingData : FAD::State::kConnected;
         }
 
@@ -1691 +1691 @@
 
         T::AddStateName(FAD::State::kWritingData, "WritingData",
-                        "The event builder has an open file (that does not mean that new events are currently received)");
+                        "The event builder has an open file which belongs to the last run started (that does not mean that new events are currently received)");
 
         // FAD Commands