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

Timestamp:

12/03/12 14:40:26 (12 years ago)

Author:

lyard

Message:

changed behavior. Now if service format changes, a new file is opened

File:

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

trunk/FACT++/src/Fits.cc

@@ -125 +125 @@
     {//if we arrived here, this means that the columns descriptions could not be parsed
         ostringstream str;
-        str << "Expected " << dataFormat.size() << " descriptions of columns, got " << desc.size()-1 << " for service: ";
+        str << "Expected " << dataFormat.size() << " descriptions of columns, got " << (int)(desc.size())-1 << " for service: ";
         if (desc.size() > 0)
             str << desc[0].name;
@@ -208 +208 @@
         {
             Close();
-            return false;
+            //if the file already exist, then the column names must have changed
+            //let's move the file and try to open it again.
+            string fileNameWithoutFits = fFileName.substr(0, fileName.size()-4);
+            int counter = 0;
+            while (counter < 100)
+            {
+                ostringstream newFileName;
+                newFileName << fileNameWithoutFits << counter << ".fits";
+                ifstream testStream(newFileName.str().c_str());
+                if (!testStream)
+                {
+                    if (rename(fFileName.c_str(), newFileName.str().c_str()))
+                        return false;
+                    break;
+                }
+                counter++;
+            }
+            if (counter == 100)
+                return false;
+            //now we open it again.
+            fFile = new FitsFile(*fMess);
+            if (file == NULL)
+            {
+                if (!fFile->OpenFile(fileName, true))
+                    return false;
+                fNumOpenFitsFiles = fitsCounter;
+                (*fNumOpenFitsFiles)++;
+            }
+            else
+            {
+                if (!fFile->SetFile(file))
+                    return false;
+            }
+            //YES, we must also redo that thing here...
+            //concatenate the standard and data columns
+            //do it the inneficient way first: its easier and faster to code.
+            for (unsigned int i=0;i<fStandardColDesc.size();i++)
+            {
+                fFile->AddColumn(fStandardColDesc[i].name, fStandardFormats[i],
+                                 fStandardColDesc[i].unit);
+            }
+
+            for (unsigned int i=0; i<fDataColDesc.size(); i++)
+            {
+                string name = fDataColDesc[i].name;
+                if (name.empty())
+                {
+                    ostringstream stt;
+                    stt << "Data" << i;
+                    name = stt.str();
+                }
+        //cout << endl << "#####adding column: " << name << " " << fDataFormats[i] << " " << fDataColDesc[i].unit << endl << endl;
+                fFile->AddColumn(name, fDataFormats[i], fDataColDesc[i].unit);
+            }
+            if (!fFile->OpenNewTable(tableName, 100))
+            {
+                Close();
+                return false;
+            }
         }
 
         fCopyBuffer.resize(fFile->GetDataSize());
 //write header comments
+
         ostringstream str;
         for (unsigned int i=0;i<fStandardColDesc.size();i++)
@@ -240 +299 @@
             fFile->WriteKeyNT(str.str(), fDataColDesc[i].comment, "");
         }
+
         fFile->WriteKeyNT("COMMENT", fTableDesc, "");
 
@@ -250 +310 @@
             fEndMjD = Time().Mjd();
         }
+
         return fFile->GetNumRows()==0 ? WriteHeaderKeys() : true;
     }
     catch (const CCfits::FitsException &e)
     {
+        cout << "Exception !" << endl;
         fMess->Error("Opening or creating table '"+tableName+"' in '"+fileName+"': "+e.message());
 
@@ -323 +385 @@
         shift += fStandardNumBytes[i];
     }
-
     try
     {
@@ -339 +400 @@
     // This is not necessary, is it?
     // fFile->fTable->makeThisCurrent();
-
     if (!fFile->AddRow())
     {
@@ -346 +406 @@
         return false;
     }
-
     if (!fFile->WriteData(fCopyBuffer))
     {
@@ -352 +411 @@
         return false;
     }
-
     const double tm = *reinterpret_cast<double*>(fStandardPointers[0]);
 
@@ -385 +443 @@
     if (!fFile)
         return;
-
     if (fFile->IsOpen() && fFile->IsOwner())
     {
@@ -395 +452 @@
                           "Time when last event received");
     }
-
     if (fFile->IsOwner())
     {
@@ -401 +457 @@
             (*fNumOpenFitsFiles)--;
     }
-
     const string name = fFile->GetName();
-
     delete fFile;
     fFile = NULL;
-
     fMess->Info("Closed: "+name);
-
 //    fMess = NULL;
 }