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

Timestamp:

05/18/11 16:00:41 (13 years ago)

Author:

lyard

Message:

added configurable grouping and did some cosmetics to the code (removed tabs)

File:

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

trunk/FACT++/src/Fits.cc

@@ -35 +35 @@
 //! @param numDataBytes the number of bytes taken by the variable
 //
-void Fits::AddStandardColumn(Description& desc, std::string dataFormat, void* dataPointer, long unsigned int numDataBytes)
+void Fits::AddStandardColumn(Description& desc, string dataFormat, void* dataPointer, long unsigned int numDataBytes)
 {
         //check if entry already exist
-        for (std::vector<Description>::iterator it=fStandardColDesc.begin(); it != fStandardColDesc.end(); it++)
+        for (vector<Description>::iterator it=fStandardColDesc.begin(); it != fStandardColDesc.end(); it++)
                 if (it->name == desc.name)
                         return;
@@ -54 +54 @@
 //! @param numDataBytes the number of bytes taken by the DIM data. 
 //      
-void Fits::InitDataColumns(std::vector<Description> desc, std::vector<std::string>& dataFormat, void* dataPointer, int numDataBytes)
+void Fits::InitDataColumns(vector<Description> desc, vector<string>& dataFormat, void* dataPointer, int numDataBytes)
 {//we will copy this information here. It duplicates the data, which is not great, but it is the easiest way of doing it right now
         if (desc.size() == dataFormat.size())
@@ -65 +65 @@
                 for (unsigned int i=0;i<dataFormat.size();i++)
                 {
-                        std::stringstream stt;
+                        stringstream stt;
                         stt << "Data" << i;
                         fDataColDesc.push_back(Description(stt.str(), "comment", "unit"));
@@ -83 +83 @@
 //! @param out a pointer to the MessageImp that should be used to log errors
 //
-void Fits::Open(const std::string& fileName, const std::string& tableName, FITS* file, int* fitsCounter, MessageImp* out)//std::ostream& out)
+void Fits::Open(const string& fileName, const string& tableName, FITS* file, int* fitsCounter, MessageImp* out)//ostream& out)
 {               
 //      if (fMess)
@@ -98 +98 @@
                 catch (CCfits::FitsError e)
                 {                       
-                        std::stringstream str;
+                        stringstream str;
                         str << "Could not open FITS file " << fileName << " reason: " << e.message();
                         fMess->Error(str);
@@ -115 +115 @@
         //concatenate the standard and data columns
         //do it the inneficient way first: its easier and faster to code.
-        std::vector<std::string> allNames;
-        std::vector<std::string> allDataTypes;
-        std::vector<std::string> allUnits;
+        vector<string> allNames;
+        vector<string> allDataTypes;
+        vector<string> allUnits;
         fTotalNumBytes = 0;
         for (unsigned int i=0;i<fStandardColDesc.size();i++)
@@ -133 +133 @@
                 else 
                 {
-                        std::stringstream stt;
+                        stringstream stt;
                         stt << "Data" << i;
                         allNames.push_back(stt.str());
@@ -145 +145 @@
         try
         {
-                std::string factTableName = "FACT-" + tableName;
+                string factTableName = "FACT-" + tableName;
                 fTable = fFile->addTable(factTableName, 0, allNames, allDataTypes, allUnits);
                 fTable->makeThisCurrent();
@@ -159 +159 @@
                         }       
                         //read the table binary data.
-                        std::vector<string> colName;
+                        vector<string> colName;
                         bTable->readData(true, colName);
 
                         //double check that the data was indeed read from the disk. Go through the fTable instead as colName is empty (yes, it is !)
-                        std::map<std::string, Column*> cMap = fTable->column();
-                        std::map<std::string, Column*>::iterator cMapIt;
+                        map<string, Column*> cMap = fTable->column();
+                        map<string, Column*>::iterator cMapIt;
 
                         for (cMapIt = cMap.begin(); cMapIt != cMap.end(); cMapIt++)
@@ -179 +179 @@
         catch(CCfits::FitsError e)
         {
-                std::stringstream str;
+                stringstream str;
                 str << "Could not open or create FITS table " << tableName << " in  file " << fileName << " reason: " << e.message();
                 fMess->Error(str);
@@ -190 +190 @@
                 WriteHeaderKeys();
 }
+// --------------------------------------------------------------------------
+//
+//!This writes a single header key in the currently open file.
+//!@param name the key
+//!@param value the key value
+//!@param a comment explaining the meaning of the key
 template <typename T>
 void Fits::WriteSingleHeaderKey(string name, T value, string comment)
@@ -199 +205 @@
         catch (CCfits::FitsError e)
         {
-                std::stringstream str;
+                stringstream str;
                 str << "Could not add header keys in file " << fFileName << " reason: " << e.message();
                 fMess->Error(str);
@@ -212 +218 @@
         if (!fTable)
                 return;
-        std::string name;
-        std::string comment;
-        
-//      float floatValue;
-//      double doubleValue;
-        std::string stringValue;
+        string name;
+        string comment;
+
+        string stringValue;
 
         WriteSingleHeaderKey("EXTREL", 1.0f, "Release Number");
@@ -230 +234 @@
         WriteSingleHeaderKey("TIMEREF", "UTC", "Time reference frame");
         WriteSingleHeaderKey("MJDREF", fRefMjD, "Modified Julian Date of origin");
+    WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data");
 }
 // --------------------------------------------------------------------------
@@ -239 +244 @@
 {
 
-//      try
-//      {
         fTable->makeThisCurrent();
         int status(0);
         if (fits_insert_rows(fTable->fitsPointer(), fNumRows, 1, &status))
         {
-                std::stringstream str;
+                stringstream str;
                 str << "Could not insert row in file " << fFileName << ". cfitsio error code: " << status;
                 fMess->Error(str);
         }
-//              fTable->insertRows(fNumRows);
-//      }
-//      catch(CCfits::FitsError e)
-//      {
-//              std::stringstream str;
-//              str << "Could not insert row in file " << fFileName << " reason: " << e.message();
-//              fMess->Error(str);
-//      }
         fNumRows++;
 
@@ -273 +268 @@
         {
                 const char * charSrc = static_cast<char*>(fStandardPointers[i]);
-
                 reverse_copy(charSrc, charSrc+fStandardNumBytes[i], &fCopyBuffer[shift]);
-//              for (int j=0; j<fStandardNumBytes[i]; j++)
-//                      fCopyBuffer[shift+j] = static_cast<char*>(fStandardPointers[i])[fStandardNumBytes[i]-(j+1)];
                 shift+= fStandardNumBytes[i];   
         }
@@ -284 +276 @@
                          
         //data copied to buffer, can write to fits
-//      int status = 0;
-        //TODO check the status after the write operation
         fits_write_tblbytes(fFile->fitsPointer(), fNumRows, 1, fTotalNumBytes, fCopyBuffer, &status);
         if (status)
@@ -291 +281 @@
                 char text[30];//max length of cfitsio error strings (from doc)
                 fits_get_errstatus(status, text);
-                std::stringstream str;
+                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
-/*      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);      
-        }
-*/}
+}
 // --------------------------------------------------------------------------
 //
@@ -335 +313 @@
 
 // --------------------------------------------------------------------------
-//
+//! Returns the size on the disk of the Fits file being written.
 int Fits::GetWrittenSize()
 {