Changeset 12034
- Timestamp:
- 09/08/11 15:11:37 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/datalogger.cc
r12033 r12034 1109 1109 Message(str); 1110 1110 1111 if (GetCurrentState() != kSM_Logging )1111 if (GetCurrentState() != kSM_Logging && GetCurrentState() != kSM_WaitingRun ) 1112 1112 return; 1113 1113 //open the log and report files … … 1234 1234 ofstream* targetRunFile = NULL; 1235 1235 RunNumberType* cRunNumber = NULL; 1236 if (GetCurrentState() == kSM_Logging )1236 if (GetCurrentState() == kSM_Logging || GetCurrentState() == kSM_WaitingRun) 1237 1237 { 1238 1238 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 _ 1774 1774 bool hasGrouping = false; 1775 if (!sub.runFile.IsOpen() && ( GetCurrentState() == kSM_Logging))1775 if (!sub.runFile.IsOpen() && ((GetCurrentState() == kSM_Logging) || (GetCurrentState() == kSM_WaitingRun))) 1776 1776 {//will we find this service in the grouping list ? 1777 1777 for (set<string>::const_iterator it=fGrouping.begin(); it!=fGrouping.end(); it++) … … 1821 1821 } 1822 1822 //do the actual file open 1823 if (!sub.runFile.IsOpen() && (GetCurrentState() == kSM_ Logging) && sub.runNumber != 0)1823 if (!sub.runFile.IsOpen() && (GetCurrentState() == kSM_WaitingRun || GetCurrentState() == kSM_Logging) && sub.runNumber != 0) 1824 1824 {//buffer for the run file have already been allocated when doing the Nightly file 1825 1825 string fileNameOnly; … … 2196 2196 Debug("Going to the Ready state..."); 2197 2197 } 2198 if (GetCurrentState() == kSM_Logging )2198 if (GetCurrentState() == kSM_Logging || GetCurrentState() == kSM_WaitingRun) 2199 2199 StopRunPlease(); 2200 2200 //it may be that dim tries to write a dimInfo while we're closing files. Prevent that
Note:
See TracChangeset
for help on using the changeset viewer.