Changeset 19027 for trunk/FACT++

Timestamp:

06/25/18 10:11:56 (6 years ago)

Author:

tbretz

Message:

Be a bit more specific when closing a file to avoid confusion. Same for opening a file. In additon there is no need when the run number changes to overwrite maxEvt. This was an early hack to close the file (which is done now automatically whenever a new file is opened) and produces wrong output ('file closed after 1005 events').

File:

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

trunk/FACT++/src/EventBuilder.cc

@@ -654 +654 @@
     if (newrun)
     {
-        // Since we have started a new run, we know already when to close the
-        // previous run in terms of number of events
-        actrun->maxEvt = actrun->lastEvt;
-
         factPrintf(MessageImp::kInfo, "New run %d (evt=%d) registered with roi=%d(%d), prev=%d",
                    rd.H.runnumber, rd.H.fad_evt_counter, nRoi[0], nRoi[8], actrun->runId);
@@ -842 +838 @@
             }
 
-            factPrintf(MessageImp::kInfo, "Opened new file for run %d (evt=%d)", evt->runNum, evt->evNum);
+            factPrintf(MessageImp::kInfo, "Opened new file for data from run %d (evt=%d)", evt->runNum, evt->evNum);
             run.fileStat = kFileOpen;
         }
@@ -880 +876 @@
     vector<string> reason;
     if (evt->closeRequest&kRequestManual)
-        reason.emplace_back("close requested");
+        reason.emplace_back("close was requested");
     if (evt->closeRequest&kRequestTimeout)
-        reason.emplace_back("receive timeout");
+        reason.emplace_back("receive timed out");
     if (evt->closeRequest&kRequestConnectionChange)
         reason.emplace_back("connection changed");
@@ -888 +884 @@
         reason.emplace_back("event check failed");
     if (evt->closeRequest&kRequestMaxTimeReached)
-        reason.push_back(to_string(run.closeTime-run.openTime)+"s reached");
+        reason.push_back(to_string(run.closeTime-run.openTime)+"s had been reached");
     if (evt->closeRequest&kRequestMaxEvtsReached)
-        reason.push_back(to_string(run.maxEvt)+" evts reached");
+        reason.push_back(to_string(run.maxEvt)+" evts had been reached");
     if (!rc1)
         reason.emplace_back("runWrite failed");
 
     const string str = boost::algorithm::join(reason, ", ");
-    factPrintf(MessageImp::kInfo, "File closed because %s",  str.c_str());
+    factPrintf(MessageImp::kInfo, "File %d was closed because %s", run.runId,  str.c_str());
 
     return true;