Changeset 12098 for trunk/FACT++/src

Timestamp:

09/14/11 09:02:39 (13 years ago)

Author:

lyard

Message:

removed -1 run report

File:

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

trunk/FACT++/src/datalogger.cc

@@ -340 +340 @@
     string CompileFileName(const string& service, const string& extension, const Time& time=Time());
     ///Form the files path
-    string CompileFileNameWithPath(const string &path, const uint32_t run, const string &service, const string & extension, const Time &time=Time());
+    string CompileFileNameWithPath(const string &path, const int32_t run, const string &service, const string & extension, const Time &time=Time());
     ///Form the file names only
-    string CompileFileName(const uint32_t run, const string& service, const string& extension);//, const Time& time=Time());
+    string CompileFileName(const int32_t run, const string& service, const string& extension);//, const Time& time=Time());
     ///Check whether service is in black and/or white list
     bool ShouldSubscribe(const string& server, const string& service);
@@ -679 +679 @@
 //! @param extension the extension to add, if any
 //
-string DataLogger::CompileFileName(const uint32_t run, const string& service, const string& extension)
+string DataLogger::CompileFileName(const int32_t run, const string& service, const string& extension)
 {
        ostringstream str;
@@ -703 +703 @@
 //! @param extension the extension to add, if any
 //
-string DataLogger::CompileFileNameWithPath(const string& path, const uint32_t run, const string& service, const string& extension, const Time& time)
+string DataLogger::CompileFileNameWithPath(const string& path, const int32_t run, const string& service, const string& extension, const Time& time)
 {
     ostringstream str;
@@ -1103 +1103 @@
     //Add new run number to run number list
     fRunNumber.push_back(RunNumberType());
-    fRunNumber.back().runNumber = uint32_t(newRun);
+    fRunNumber.back().runNumber = int32_t(newRun);
     fRunNumber.back().time = time;
 
@@ -1113 +1113 @@
         return;
     //open the log and report files
+    if (fRunNumber.back().runNumber > 0)
     if (OpenRunFile(fRunNumber.back()) != 0)
     {//an error occured. close current run files and go to error state