Changeset 10930

Timestamp:

06/08/11 18:04:28 (14 years ago)

Author:

tbretz

Message:

Moved Time argument as last and default argument in CompileFileName; some little changes to some output

File:

• trunk/FACT++/src/dataLogger.cc (modified) (20 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -423 +423 @@
     void AppendYearMonthDaytoPath(string& path);
     ///Form the files path
-    string CompileFileName(const string &path, const Time &time, const string &service, const string & extension);
+    string CompileFileName(const string &path, const string &service, const string & extension, const Time &time=Time());
     ///Form the files path
-    string CompileFileName(const string &path, const Time &time, uint32_t run, const string &service, const string & extension);
+    string CompileFileName(const string &path, uint32_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);
@@ -690 +690 @@
 //! @param extension the extension to add, if any
 //
-string DataLogger::CompileFileName(const string &path, const Time &time, const string &service, const string & extension)
+string DataLogger::CompileFileName(const string &path, const string &service, const string & extension, const Time &time)
 {
        ostringstream str;
@@ -725 +725 @@
 //! @param extension the extension to add, if any
 //
-string DataLogger::CompileFileName(const string &path, const Time &time, uint32_t run, const string &service, const string & extension)
+string DataLogger::CompileFileName(const string &path, uint32_t run, const string &service, const string & extension, const Time &time)
 {
        ostringstream str;
@@ -1215 +1215 @@
         return -1;
     }
-    run.logName = CompileFileName(fRunFilePath, Time(), run.runNumber, "", "log");
+    run.logName = CompileFileName(fRunFilePath, run.runNumber, "", "log");
     errno = 0;
     run.logFile->open(run.logName.c_str(), ios_base::out | ios_base::app);
@@ -1226 +1226 @@
 #endif
     //open report file
-    run.reportName = CompileFileName(fRunFilePath, Time(), run.runNumber, "", "rep");
+    run.reportName = CompileFileName(fRunFilePath, run.runNumber, "", "rep");
     if (run.reportFile->is_open())
     {
@@ -1265 +1265 @@
 
     //TODO this notification scheme might be messed up now.... fix it !
-    string baseFileName = CompileFileName(fRunFilePath, Time(), run.runNumber, "", "");
+    string baseFileName = CompileFileName(fRunFilePath, run.runNumber, "", "");
     NotifyOpenedFile(baseFileName, 3, fOpenedRunFiles);
     run.openedFits.clear();
@@ -1357 +1357 @@
     //construct the header
     ostringstream header;
-    Time cTime(I->getTimestamp(), I->getTimestampMillisecs()*1000);
+    const Time cTime(I->getTimestamp(), I->getTimestampMillisecs()*1000);
     fQuality = I->getQuality();
     fMjD = cTime.Mjd();
@@ -1394 +1394 @@
                 Error(str);
             }
+
         }
     }
@@ -1495 +1496 @@
     //print active run numbers
     ostringstream str;
-    str << "Active Run Numbers: ";
+    str << "Active Run Numbers:";
     for (list<RunNumberType>::iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
-        str << "\n" << it->runNumber;
+        str << " " << it->runNumber;
+    if (fRunNumber.size()==0)
+        str << " <none>";
     Message(str);
 
@@ -1503 +1506 @@
     Message("------------ OPENED FILES ----------------");
     if (fNightlyLogFile.is_open())
-        Message("Nightly log-file: "/*+filename+*/" (OPEN)");
+        Message("Nightly log-file: OPEN");
 
     if (fNightlyReportFile.is_open())
-        Message("Nightly report-file: "/*filename+*/" (OPEN)");
+        Message("Nightly report-file: OPEN");
 
     for (list<RunNumberType>::iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
@@ -1758 +1761 @@
         {
             ostringstream str;
-            str << "Updating files service " << service->getName() << "with code: " << type << " and file: " << name;
+            str << "Updating " << service->getName() << " file '" << name << "' (type=" << type << ")";
             Debug(str);
             str.str("");
@@ -1789 +1792 @@
         Debug("Starting...");    
     }
-    fFullNightlyLogFileName = CompileFileName(fNightlyFilePath, Time(), "", "log");
+    fFullNightlyLogFileName = CompileFileName(fNightlyFilePath, "", "log");
     OpenTextFilePlease(fNightlyLogFile, fFullNightlyLogFileName);
 
-    fFullNightlyReportFileName = CompileFileName(fNightlyFilePath, Time(), "", "rep");
+    fFullNightlyReportFileName = CompileFileName(fNightlyFilePath, "", "rep");
     OpenTextFilePlease(fNightlyReportFile, fFullNightlyReportFileName);
 
@@ -1810 +1813 @@
 
     //notify that a new file has been opened.
-    string baseFileName = CompileFileName(fNightlyFilePath, Time(), "", "");
+    string baseFileName = CompileFileName(fNightlyFilePath, "", "");
     NotifyOpenedFile(baseFileName, 3, fOpenedNightlyFiles);
 
@@ -1860 +1863 @@
     {
         string fileNameOnly, partialName;
-        partialName = CompileFileName(fNightlyFilePath, Time(), serviceName, "fits");
+        partialName = CompileFileName(fNightlyFilePath, serviceName, "fits");
         fileNameOnly = partialName.substr(partialName.find_last_of('/')+1, partialName.size());
         AllocateFITSBuffers(sub);
@@ -1870 +1873 @@
 
         //notify the opening
-        string baseFileName = CompileFileName(fNightlyFilePath, Time(), "", "");
+        string baseFileName = CompileFileName(fNightlyFilePath, "", "");
         NotifyOpenedFile(baseFileName, 7, fOpenedNightlyFiles);
         if (fNumSubAndFitsIsOn)
@@ -1877 +1880 @@
         {
             ostringstream str;
-            str << "Opened Nightly FITS: " << partialName << " and table: FACT-" << serviceName << ".current number of opened FITS: " << fNumSubAndFitsData.numOpenFits;
+            str << "Opened Nightly FITS: " << partialName << " and table: " << serviceName << ".current number of opened FITS: " << fNumSubAndFitsData.numOpenFits;
             Debug(str);
         }
@@ -1888 +1891 @@
         if (hasGrouping)
         {
-            partialName = CompileFileName(fRunFilePath, Time(), sub.runNumber, "group", "fits");
+            partialName = CompileFileName(fRunFilePath, sub.runNumber, "group", "fits");
             fileNameOnly = partialName.substr(partialName.find_last_of('/')+1, partialName.size());
         }
         else
         {
-            partialName = CompileFileName(fRunFilePath, Time(), sub.runNumber, serviceName, "fits");
+            partialName = CompileFileName(fRunFilePath, sub.runNumber, serviceName, "fits");
             fileNameOnly = partialName.substr(partialName.find_last_of('/')+1, partialName.size());
         }
@@ -1919 +1922 @@
             }
 
-        string baseFileName = CompileFileName(fRunFilePath, Time(), sub.runNumber, "", "");
+        string baseFileName = CompileFileName(fRunFilePath, sub.runNumber, "", "");
         NotifyOpenedFile(baseFileName, 7, fOpenedRunFiles);// + '_' + serviceName, 4);
         if (hasGrouping)
@@ -1931 +1934 @@
         {
             ostringstream str;
-            str << "Opened Run FITS: " << partialName << " and table: FACT-" << serviceName << ".current number of opened FITS: " << fNumSubAndFitsData.numOpenFits;
+            str << "Opened Run FITS: " << partialName << " and table: " << serviceName << ".current number of opened FITS: " << fNumSubAndFitsData.numOpenFits;
             Debug(str);
         }
@@ -2101 +2104 @@
     string groupName;
     if (runNumber != 0)
-        groupName = CompileFileName(fRunFilePath, Time(), runNumber, "", "fits");
+        groupName = CompileFileName(fRunFilePath, runNumber, "", "fits");
     else
-        groupName = CompileFileName(fNightlyFilePath, Time(), "", "fits");
+        groupName = CompileFileName(fNightlyFilePath, "", "fits");
 
     CCfits::Table* groupTable;