Changeset 11325 for trunk/FACT++/src/datalogger.cc

Timestamp:

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

Author:

tbretz

Message:

Updated output when opening and closing files.

File:

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

trunk/FACT++/src/datalogger.cc

@@ -613 +613 @@
 bool DataLogger::OpenTextFilePlease(ofstream& stream, const string& name)
 {
-    Info("Opening: "+name);
-
     errno = 0;
     stream.open(name.c_str(), ios_base::out | ios_base::app);
@@ -624 +622 @@
         return false;
     }
+
+    Info("Opened: "+name);
 
     return true;
@@ -1205 +1205 @@
 bool DataLogger::OpenStream(shared_ptr<ofstream> stream, const string &filename)
 {
-    Info("Opening: "+filename);
-
     if (stream->is_open())
     {
@@ -1232 +1230 @@
         return false;
     }
+
+    Info("Opened: "+filename);
 
     return true;
@@ -2016 +2016 @@
             fOpenedNightlyFits[fileNameOnly].push_back(serviceName);
 
-        ostringstream str;
-        str << "Opening: " << partialName << " (Nfits=" << fNumSubAndFitsData.numOpenFits << ")";
-        Info(str);
-
         if (!sub.nightlyFile.Open(partialName, serviceName, NULL, &fNumSubAndFitsData.numOpenFits, this, 0))
         {
@@ -2026 +2022 @@
             return;
         }
+
+        ostringstream str;
+        str << "Opened: " << partialName << " (Nfits=" << fNumSubAndFitsData.numOpenFits << ")";
+        Info(str);
+
         //notify the opening
         const string baseFileName = CompileFileNameWithPath(fNightlyFilePath, "", "");
@@ -2077 +2078 @@
         NotifyOpenedFile(baseFileName, 7, fOpenedRunFiles);// + '_' + serviceName, 4);
 
-        ostringstream str;
-        str << "Opening: " << partialName << " (Nfits=" << fNumSubAndFitsData.numOpenFits << ")";
-        Info(str);
-
         if (hasGrouping)
         {
@@ -2099 +2096 @@
             }
         }
+
+        ostringstream str;
+        str << "Opened: " << partialName << " (Nfits=" << fNumSubAndFitsData.numOpenFits << ")";
+        Info(str);
+
         if (fNumSubAndFitsIsOn)
             fNumSubAndFits->updateService();