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

Timestamp:

04/21/11 12:27:37 (14 years ago)

Author:

lyard

Message:

Added dataLogger services and use only one file for fits runs

File:

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

trunk/FACT++/src/Fits.cc

@@ -18 +18 @@
 #include "Time.h"
 #include "Converter.h"
+
+//for file stats
+#include <sys/stat.h>
 
 using namespace std;
@@ -32 +35 @@
 void Fits::AddStandardColumn(Description& desc, std::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++)
+                if (it->name == desc.name)
+                        return;
         fStandardColDesc.push_back(desc);
         fStandardFormats.push_back(dataFormat);
@@ -53 +60 @@
         else
         {
+                fDataColDesc.clear();
                 for (unsigned int i=0;i<dataFormat.size();i++)
                 {
@@ -69 +77 @@
 //! @param fileName the filename with complete or relative path of the file to open
 //! @param tableName the name of the table that will receive the logged data.
-//
-void Fits::Open(const std::string& fileName, const std::string& tableName)
+//! @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)
 {               
-        try
-        {
-                fFile = new FITS(fileName, RWmode::Write);
-        }
-        catch (FITS::CantOpen)
-        {
-                std::ostringstream err;
-                err << "Could not open " << fileName << ".Skipping it.";
-                throw runtime_error(err.str()); 
-        }       
+        fFileName = fileName;
+        if (file == NULL)
+        {
+                try
+                {
+                        fFile = new FITS(fileName, RWmode::Write);
+                }
+                catch (FITS::CantOpen)
+                {
+                        std::ostringstream err;
+                        err << "Could not open " << fileName << ".Skipping it.";
+                        throw runtime_error(err.str()); 
+                }       
+                fOwner = true;
+        }
+        else
+        {
+                fFile = file;
+                fOwner = false;
+        }
         //concatenate the standard and data columns
         //do it the inneficient way first: its easier and faster to code.
@@ -206 +225 @@
 void Fits::Write(Converter* conv)
 {
+
+        fTable->makeThisCurrent();
         try
         {
@@ -240 +261 @@
 
         //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();
 }
@@ -252 +274 @@
 //                      if (fTable != NULL)
 //                              delete fTable;
+
         std::string name = "TEND";
         double doubleValue = fEndMjD;
         std::string comment = "Time of the last received data";
         fTable->addKey(name, doubleValue, comment);
-
-        if (fFile != NULL)
+        
+        if (fFile != NULL && fOwner)
                 delete fFile;
         fFile = NULL;
@@ -264 +287 @@
         fCopyBuffer = NULL;
 }
+
+// --------------------------------------------------------------------------
+//
+//! This closes the currently openned FITS file. 
+//! it also updates the header to reflect the time of the last logged row
+//      
+int Fits::GetWrittenSize()
+{
+        if (!IsOpen())
+                return 0;
+                
+        struct stat st;
+        if (stat(fFileName.c_str(), &st))
+                return 0;
+        else
+                return st.st_size;
+}