Changeset 10955 for trunk/FACT++/src/Fits.cc

Timestamp:

06/09/11 17:13:03 (13 years ago)

Author:

lyard

Message:

added WriteError state

File:

• trunk/FACT++/src/Fits.cc (modified) (16 diffs)

trunk/FACT++/src/Fits.cc

@@ -84 +84 @@
 //! @param runNumber the runNumber for which this file is opened. 0 means nightly file.
 //
-void Fits::Open(const string& fileName, const string& tableName, FITS* file, int* fitsCounter, MessageImp* out, int runNumber)
+bool Fits::Open(const string& fileName, const string& tableName, FITS* file, int* fitsCounter, MessageImp* out, int runNumber)
 {               
 //      if (fMess)
@@ -104 +104 @@
                         fMess->Error(str);
                         fFile = NULL;
-                        return;
+                        return false;
                 }       
                 fOwner = true;
@@ -166 +166 @@
             {
                 fMess->Error("The table " + factTableName + " could not be created nor loaded. skipping it");
-                return;
+                Close();
+                return false;
             }
             fTable->makeThisCurrent();
@@ -177 +178 @@
                         {
                                 fMess->Error("The table " + factTableName + " could not be converted to a binary table. skipping");
-                                return;
+                                Close();
+                                return false;
                         }       
                         //read the table binary data.
@@ -192 +194 @@
                                 {
                                         fMess->Error("Column " + cMapIt->first + "Could not be read back from the disk");
-                                        return; 
+                                        Close();
+                                        return false;
                                 }       
                         }
@@ -205 +208 @@
                 fMess->Error(str);
                 fTable = NULL;
+                Close();
+                return false;
         }
                         
@@ -210 +215 @@
         fRefMjD = 0;//* static_cast<double*>(fStandardPointers[0]);
         if (!updating)
-                WriteHeaderKeys();
+                return WriteHeaderKeys();
+
+        return true;
 }
 // --------------------------------------------------------------------------
@@ -219 +226 @@
 //!@param a comment explaining the meaning of the key
 template <typename T>
-void Fits::WriteSingleHeaderKey(string name, T value, string comment)
+bool Fits::WriteSingleHeaderKey(string name, T value, string comment)
 {
         try
@@ -230 +237 @@
                 str << "Could not add header keys in file " << fFileName << " reason: " << e.message();
                 fMess->Error(str);
-        }
+                return false;
+        }
+        return true;
 }
 // --------------------------------------------------------------------------
@@ -236 +245 @@
 //! This writes the standard header 
 //
-void Fits::WriteHeaderKeys()
+bool Fits::WriteHeaderKeys()
 {
         if (!fTable)
-                return;
+                return false;
         string name;
         string comment;
@@ -245 +254 @@
         string stringValue;
 
-        WriteSingleHeaderKey("EXTREL", 1.0f, "Release Number");
-        WriteSingleHeaderKey("TELESCOP", "FACT", "Telescope that acquired this data");
-        WriteSingleHeaderKey("ORIGIN", "ISDC", "Institution that wrote the file");
-        WriteSingleHeaderKey("CREATOR", "FACT++ DataLogger", "Program that wrote this file");
+        if (!WriteSingleHeaderKey("EXTREL", 1.0f, "Release Number")) return false;
+        if (!WriteSingleHeaderKey("TELESCOP", "FACT", "Telescope that acquired this data")) return false;
+        if (!WriteSingleHeaderKey("ORIGIN", "ISDC", "Institution that wrote the file")) return false;
+        if (!WriteSingleHeaderKey("CREATOR", "FACT++ DataLogger", "Program that wrote this file")) return false;
         stringValue = Time().GetAsStr();
         stringValue[10]= 'T';
-        WriteSingleHeaderKey("DATE", stringValue, "File creation data");
-        WriteSingleHeaderKey("TIMESYS", "TT", "Time frame system");
-        WriteSingleHeaderKey("TIMEUNIT", "d", "Time unit");
-        WriteSingleHeaderKey("TIMEREF", "UTC", "Time reference frame");
-        WriteSingleHeaderKey("MJDREF", fRefMjD, "Modified Julian Date of origin");
-    WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data");
+        if (!WriteSingleHeaderKey("DATE", stringValue, "File creation data")) return false;
+        if (!WriteSingleHeaderKey("TIMESYS", "TT", "Time frame system")) return false;
+        if (!WriteSingleHeaderKey("TIMEUNIT", "d", "Time unit")) return false;
+        if (!WriteSingleHeaderKey("TIMEREF", "UTC", "Time reference frame")) return false;
+        if (!WriteSingleHeaderKey("MJDREF", fRefMjD, "Modified Julian Date of origin")) return false;
+        if (!WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data")) return false;
+    return true;
 }
 // --------------------------------------------------------------------------
@@ -263 +273 @@
 //! @param conv the converter corresponding to the service being logged
 //
-void Fits::Write(Converter* conv)
+bool Fits::Write(Converter* conv)
 {
     //first copy the standard variables to the copy buffer
@@ -284 +294 @@
         str << fFileName << ": " << e.what();
         fMess->Error(str);
-        return;
+        return false;
     }
 
@@ -295 +305 @@
         str << "Inserting row into " << fFileName << " failed (fits_insert_rows, rc=" << status << ")";
         fMess->Error(str);
-        // FIXME: What is a proper action here?
+        Close();
+        return false;
     }
 
@@ -310 +321 @@
 
     //data copied to buffer, can write to fits
-    fits_write_tblbytes(fFile->fitsPointer(), fNumRows, 1, fTotalNumBytes, fCopyBuffer, &status);
-    if (status)
+    if (fits_write_tblbytes(fFile->fitsPointer(), fNumRows, 1, fTotalNumBytes, fCopyBuffer, &status))
     {
         char text[30];//max length of cfitsio error strings (from doc)
@@ -318 +328 @@
         str << "Writing FITS row " << fNumRows << " in " << fFileName << ": " << text << " (file_write_tblbytes, rc=" << status << ")";
         fMess->Error(str);
-        // FIXME: What is a proper action here?
-    }
+        Close();
+        return false;
+    }
+    return true;
 }