Changeset 11317

Timestamp:

07/10/11 15:21:20 (13 years ago)

Author:

tbretz

Message:

Removed obsolete fStatsPeriod; updated statistics

File:

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

trunk/FACT++/src/datalogger.cc

@@ -310 +310 @@
     ///configuration flags
     bool fDebugIsOn;
-    float fStatsPeriodDuration;
+//    float fStatsPeriodDuration;
     bool fOpenedFilesIsOn;
     bool fNumSubAndFitsIsOn;
@@ -987 +987 @@
      //services parameters
      fDebugIsOn = false;
-     fStatsPeriodDuration = 1.0f;
+//     fStatsPeriodDuration = 1.0f;
      fOpenedFilesIsOn = true;
      fNumSubAndFitsIsOn = true;
@@ -1574 +1574 @@
 
     //print the path configuration
-    Message("Nightly Path: " + boost::filesystem::system_complete(boost::filesystem::path(fNightlyFilePath)).directory_string());
-    Message("Run Path: " + boost::filesystem::system_complete(boost::filesystem::path(fRunFilePath)).directory_string());
+    Message("Nightly path: " + boost::filesystem::system_complete(boost::filesystem::path(fNightlyFilePath)).directory_string());
+    Message("Run path:     " + boost::filesystem::system_complete(boost::filesystem::path(fRunFilePath)).directory_string());
 
     //print active run numbers
     ostringstream str;
+    //timeout value
+    str << "Timeout delay for old run numbers: " << fRunNumberTimeout << " ms";
+    Message(str);
+    str.str("");
     str << "Active Run Numbers:";
     for (list<RunNumberType>::const_iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
@@ -1585 +1589 @@
         str << " <none>";
     Message(str);
-    //timeout value
-    str.str("");
-    str << "Timeout delay for old run numbers: " << fRunNumberTimeout << " ms";
-    Message(str);
 
     //print all the open files. 
-    Message("------------ OPENED FILES ----------------");
+    Message("------------ OPEN FILES ----------------");
     if (fNightlyLogFile.is_open())
-        Message("Nightly log-file: OPEN");
+        Message("Nightly log-file:    "+fFullNightlyLogFileName);
 
     if (fNightlyReportFile.is_open())
-        Message("Nightly report-file: OPEN");
+        Message("Nightly report-file: "+fFullNightlyReportFileName);
 
     for (list<RunNumberType>::const_iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
@@ -1602 +1602 @@
 #ifdef RUN_LOGS
         if (it->logFile->is_open())
-            Message("Run log-file: " + it->logName + " (OPEN)");
+            Message("Run log-file:    " + it->logName);
 #endif
         if (it->reportFile->is_open())
-            Message("Run report-file: " + it->reportName + " (OPEN)");
+            Message("Run report-file: " + it->reportName);
     }
 
@@ -1611 +1611 @@
  //   /*const bool statWarning =*/ calculateTotalSizeWritten(statVar, true);
 #ifdef HAVE_FITS
-    str << "There are " << fNumSubAndFitsData.numOpenFits << " FITS files open:";
+    str.str("");
+    str << "Number of open FITS files: " << fNumSubAndFitsData.numOpenFits;
     Message(str);
+    // FIXME: Print list of open FITS files
 #else
     Message("FITS output disabled at compilation");
 #endif
     Message("----------------- STATS ------------------");
+    if (fFilesStats.GetUpdateInterval()>0)
+    {
+        str.str("");
+        str << "Statistics are updated every " << fFilesStats.GetUpdateInterval() << " ms";
+        Message(str);
+    }
+    else
+        Message("Statistics updates are currently disabled.");
     str.str("");
-    str << "Total Size written: " << statVar.sizeWritten << " bytes.";
+    str << "Total Size written: " << statVar.sizeWritten/1000 << " kB";
         Message(str);
     str.str("");
-    str << "Disk free space:    " << statVar.freeSpace   << " bytes.";
-        Message(str);
-    str.str("");
-    str << "Statistics are updated every " << fStatsPeriodDuration << " seconds";
-    if (fStatsPeriodDuration != 0)
-        Message(str);
-    else
-        Message("Statistics updates are currently disabled");
+    str << "Disk free space:    " << statVar.freeSpace/1000000   << " MB";
+    Message(str);
 
     Message("------------ DIM SUBSCRIPTIONS -----------");