Changeset 11324

Timestamp:

07/10/11 17:05:36 (13 years ago)

Author:

tbretz

Message:

Updated logging when openeing and closing a file; fixed format of STATISTICS1; added fDimWriteStats

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (7 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -686 +686 @@
 #endif
 
+#include "DimWriteStatistics.h"
+
 class EventBuilderWrapper
 {
@@ -736 +738 @@
     uint32_t fNumEvts[4];
 
+    DimWriteStatistics  fDimWriteStats;
     DimDescribedService fDimRuns;
     DimDescribedService fDimEvents;
@@ -785 +788 @@
     EventBuilderWrapper(MessageImp &imp) : fMsg(imp),
         fFileFormat(kNone), fMaxRun(0), fLastOpened(0), fLastClosed(0),
+        fDimWriteStats  ("FAD_CONTROL", imp),
         fDimRuns        ("FAD_CONTROL/RUNS",             "I:5;C", ""),
         fDimEvents      ("FAD_CONTROL/EVENTS",           "I:4", ""),
@@ -794 +798 @@
         fDimTemperature ("FAD_CONTROL/TEMPERATURE",      "F:82", ""),
         fDimRefClock    ("FAD_CONTROL/REFERENCE_CLOCK",  "I:42", ""),
-        fDimStatistics1 ("FAD_CONTROL/STATISTICS1",      "I:3;I:5;I:1;X:3;C:676", ""),
+        fDimStatistics1 ("FAD_CONTROL/STATISTICS1",      "I:3;I:2;X:4;I:3;I:1;I:2;C:40;I:40;I:40;X:40", ""),
         fDimStatistics2 ("FAD_CONTROL/STATISTICS2",      "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40",  ""),
         fDebugStream(false), fDebugRead(false)
-   {
+    {
         if (This)
             throw logic_error("EventBuilderWrapper cannot be instantiated twice.");
@@ -1057 +1061 @@
         fFiles.push_back(file);
 
+        ostringstream str;
+        str << "Opened: " << file->GetFileName() << " (" << file->GetRunId() << ")";
+        fMsg.Info(str);
+
+        fDimWriteStats.FileOpened(file->GetFileName());
+
         fLastOpened = runid;
         UpdateRuns(file->GetFileName());
@@ -1118 +1128 @@
         }
 
-        ostringstream str;
-        str << "Closing file for run " << file->GetRunId() << " (" << file << ")" << endl;
-        fMsg.Info(str);
-
         fFiles.erase(it);
 
@@ -1134 +1140 @@
             // Error message
         }
+
+        ostringstream str;
+        str << "Closed: " << file->GetFileName() << " (" << file->GetRunId() << ")";
+        fMsg.Info(str);
 
         delete file;