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

Timestamp:

04/29/11 10:19:46 (14 years ago)

Author:

lyard

Message:

Added a number of subscriptions service and better error handling

File:

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

trunk/FACT++/src/Fits.cc

@@ -79 +79 @@
 //! @param file a pointer to an existing FITS file. If NULL, file will be opened and managed internally
 //
-void Fits::Open(const std::string& fileName, const std::string& tableName, FITS* file)
+void Fits::Open(const std::string& fileName, const std::string& tableName, FITS* file, int* fitsCounter, std::ostream& out)
 {               
+        if (fMess)
+                delete fMess;
+        fMess = new MessageImp(out);
+        
         fFileName = fileName;
         if (file == NULL)
@@ -88 +92 @@
                         fFile = new FITS(fileName, RWmode::Write);
                 }
-                catch (FITS::CantOpen)
-                {
-                        std::ostringstream err;
-                        err << "Could not open " << fileName << ".Skipping it.";
-                        throw runtime_error(err.str()); 
+                catch (CCfits::FitsError e)
+                {                       
+                        std::stringstream str;
+                        str << "Could not open FITS file " << fileName << " reason: " << e.message();
+                        fMess->Error(str);
+                        fFile = NULL;
+                        return;
                 }       
                 fOwner = true;
+                fNumOpenFitsFiles = fitsCounter;
+                (*fNumOpenFitsFiles)++;
         }
         else
@@ -133 +141 @@
         try
         {
-                fTable = fFile->addTable(tableName, 0, allNames, allDataTypes, allUnits);
+                std::string factTableName = "FACT-" + tableName;
+                fTable = fFile->addTable(factTableName, 0, allNames, allDataTypes, allUnits);
                 fCopyBuffer = new unsigned char[fTotalNumBytes]; 
                 fNumRows = fTable->rows();
@@ -153 +162 @@
         catch(CCfits::FitsError e)
         {
-                std::ostringstream err;
-                err << "Error when adding table " << tableName << " : " << e.message();
-                throw runtime_error(err.str());
+                std::stringstream str;
+                str << "Could not open or create FITS table " << tableName << " in  file " << fileName << " reason: " << e.message();
+                fMess->Error(str);
+                fTable = NULL;
         }
                         
-        fEndMjD = * static_cast<double*>(fStandardPointers[0]);
+        fRefMjD = * static_cast<double*>(fStandardPointers[0]);
         if (!updating)
                 WriteHeaderKeys();
@@ -168 +178 @@
 void Fits::WriteHeaderKeys()
 {
+        if (!fTable)
+                return;
         std::string name;
         std::string comment;
@@ -174 +186 @@
         double doubleValue;
         std::string stringValue;
+        try
+        {       
+                name = "EXTREL";
+                comment = "Release Number";
+                floatValue = 1.0f;
+                fTable->addKey(name, floatValue, comment);
+                                
+                name = "BASETYPE";
+                comment = "Base type of the data structure";
+                stringValue = "??????";
+                fTable->addKey(name, stringValue, comment);
+                                
+                name = "TELESCOP";
+                comment = "Telescope that acquired this data";
+                stringValue = "FACT";
+                fTable->addKey(name, stringValue, comment);
+                                
+                name = "ORIGIN";
+                comment = "Institution that wrote the file";
+                stringValue = "ISDC";
+                fTable->addKey(name, stringValue, comment);
+                                
+                name = "CREATOR";
+                comment = "Program that wrote this file";
+                stringValue = "FACT++_DataLogger";
+                fTable->addKey(name, stringValue, comment);
+                                
+                name = "DATE";
+                stringValue = Time().GetAsStr();
+                stringValue[10] = 'T';
+                comment = "File creation date";
+                fTable->addKey(name, stringValue, comment);
+                
+                name = "TIMESYS";
+                stringValue = "TT";
+                comment = "Time frame system";
+                fTable->addKey(name, stringValue, comment);
+                
+                name = "TIMEUNIT";
+                stringValue = "d";
+                comment = "Time unit";
+                fTable->addKey(name, stringValue, comment);
+                
+                name = "TIMEREF";
+                stringValue = "UTC";
+                comment = "Time reference frame";
+                fTable->addKey(name, stringValue, comment);
                         
-        name = "EXTREL";
-        comment = "Release Number";
-        floatValue = 1.0f;
-        fTable->addKey(name, floatValue, comment);
-                        
-        name = "BASETYPE";
-        comment = "Base class that wrote this file";
-        stringValue = "CCFits_table";
-        fTable->addKey(name, stringValue, comment);
-                        
-        name = "TELESCOP";
-        comment = "Telescope that acquired this data";
-        stringValue = "FACT";
-        fTable->addKey(name, stringValue, comment);
-                        
-        name = "ORIGIN";
-        comment = "Institution that wrote the file";
-        stringValue = "ISDC";
-        fTable->addKey(name, stringValue, comment);
-                        
-        name = "CREATOR";
-        comment = "Program that wrote this file";
-        stringValue = "FACT++_DataLogger";
-        fTable->addKey(name, stringValue, comment);
-                        
-        name = "DATE";
-        stringValue = Time().GetAsStr();
-        stringValue[10] = 'T';
-        comment = "File creation date";
-        fTable->addKey(name, stringValue, comment);
-                        
-        name = "TIMEREF";
-        stringValue = "UTC";
-        comment = "Time reference system";
-        fTable->addKey(name, stringValue, comment);
-                        
-        name = "TSTART";
-        doubleValue = fEndMjD;
-        comment = "Time of the first received data";
-        fTable->addKey(name, doubleValue, comment);
-                        
+                name = "MJDREF";
+                doubleValue = fRefMjD;
+                comment = "Modified Julian Date of origin";
+                fTable->addKey(name, doubleValue, comment);
+        }
+        catch (CCfits::FitsError e)
+        {
+                std::stringstream str;
+                str << "Could not add header keys in file " << fFileName << " reason: " << e.message();
+                fMess->Error(str);
+        }                       
         //More ?
 }
@@ -233 +262 @@
         catch(CCfits::FitsError e)
         {
-                std::ostringstream err;
-                err << "Error when inserting a row: " << e.message();
-                throw runtime_error(err.str());
+                std::stringstream str;
+                str << "Could not insert row in file " << fFileName << " reason: " << e.message();
+                fMess->Error(str);
         }
         fNumRows++;
                         
         //the first standard variable is the current MjD
+        if (fEndMjD == 0)
+        {
+                std::string name = "TSTART";
+                double doubleValue = *static_cast<double*>(fStandardPointers[0]) - fRefMjD;
+                std::string comment = "Time of the first received data";
+                fTable->addKey(name, doubleValue, comment);     
+        }
         fEndMjD = * static_cast<double*>(fStandardPointers[0]);
                         
@@ -259 +295 @@
         //TODO check the status after the write operation
         fits_write_tblbytes(fFile->fitsPointer(), fNumRows, 1, fTotalNumBytes, fCopyBuffer, &status);
-
+        if (status)
+        {
+                char text[30];//max length of cfitsio error strings (from doc)
+                fits_get_errstatus(status, text);
+                std::stringstream str;
+                str << "Error while writing FITS row in " << fFileName << ". Message: " << text << " [" << status << "]";
+                fMess->Error(str);      
+        }
         //This forces the writting of each row to the disk. Otherwise all rows are written when the file is closed.
         ///TODO check whether this consumes too much resources or not. If it does, flush every N write operations instead
-        fFile->flush();
+        try
+        {
+                fFile->flush();
+        }
+        catch (CCfits::FitsError e)
+        {
+                std::stringstream str;
+                str << "Error while flushing bytes to disk. File: " << fFileName << " reason: " << e.message();
+                fMess->Error(str);      
+        }
 }
 // --------------------------------------------------------------------------
@@ -274 +326 @@
 //                      if (fTable != NULL)
 //                              delete fTable;
-
         std::string name = "TEND";
-        double doubleValue = fEndMjD;
+        double doubleValue = fEndMjD - fRefMjD;
         std::string comment = "Time of the last received data";
         fTable->addKey(name, doubleValue, comment);
@@ -286 +337 @@
                 delete [] fCopyBuffer;
         fCopyBuffer = NULL;
+        if (fOwner && fNumOpenFitsFiles != NULL)
+                (*fNumOpenFitsFiles)--;
+        if (fMess)
+                delete fMess;
+        fMess = NULL;
 }