Changeset 12034

Timestamp:

09/08/11 15:11:37 (14 years ago)

Author:

lyard

Message:

merged waiting run and logging states

File:

• trunk/FACT++/src/datalogger.cc (modified) (5 diffs)

trunk/FACT++/src/datalogger.cc ¶

@@ -1109 +1109 @@
     Message(str);
 
-    if (GetCurrentState() != kSM_Logging)
+    if (GetCurrentState() != kSM_Logging && GetCurrentState() != kSM_WaitingRun )
         return;
     //open the log and report files
@@ -1234 +1234 @@
     ofstream* targetRunFile = NULL;
     RunNumberType* cRunNumber = NULL;
-    if (GetCurrentState() == kSM_Logging)
+    if (GetCurrentState() == kSM_Logging || GetCurrentState() == kSM_WaitingRun)
     {
         list<RunNumberType>::reverse_iterator rit;
@@ -1773 +1773 @@
      //we must check if we should group this service subscription to a single fits file before we replace the / by _
     bool hasGrouping = false;
-    if (!sub.runFile.IsOpen() && (GetCurrentState() == kSM_Logging))
+    if (!sub.runFile.IsOpen() && ((GetCurrentState() == kSM_Logging) || (GetCurrentState() == kSM_WaitingRun)))
     {//will we find this service in the grouping list ?
         for (set<string>::const_iterator it=fGrouping.begin(); it!=fGrouping.end(); it++)
@@ -1821 +1821 @@
     }
     //do the actual file open
-    if (!sub.runFile.IsOpen() && (GetCurrentState() == kSM_Logging) && sub.runNumber != 0)
+    if (!sub.runFile.IsOpen() && (GetCurrentState() == kSM_WaitingRun || GetCurrentState() == kSM_Logging) && sub.runNumber != 0)
     {//buffer for the run file have already been allocated when doing the Nightly file
         string fileNameOnly;
@@ -2196 +2196 @@
         Debug("Going to the Ready state...");
    }
-   if (GetCurrentState() == kSM_Logging)
+   if (GetCurrentState() == kSM_Logging || GetCurrentState() == kSM_WaitingRun)
        StopRunPlease();
    //it may be that dim tries to write a dimInfo while we're closing files. Prevent that