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

Timestamp:

06/08/11 14:40:14 (13 years ago)

Author:

lyard

Message:

Fixed a bug with the update of Fits files and grouping of daily files

File:

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

trunk/FACT++/src/Fits.cc

@@ -148 +148 @@
         {
                 string factTableName = "FACT-" + tableName;
-                fTable = fFile->addTable(factTableName, 0, allNames, allDataTypes, allUnits);
-                fTable->makeThisCurrent();
+                //first, let's check if the table already exist in the file
+                vector<string> tryToLoadName;
+                tryToLoadName.push_back(factTableName);
+                fFile->read(tryToLoadName);
+            const multimap< string, CCfits::ExtHDU * >& extMap = fFile->extension();
+            if (extMap.find(factTableName) == extMap.end())
+            {
+                for (multimap<string, CCfits::ExtHDU*>::const_iterator it=extMap.begin(); it!= extMap.end(); it++)
+                    fMess->Debug(it->first);
+                fTable = fFile->addTable(factTableName, 0, allNames, allDataTypes, allUnits);
+            }
+            else
+            {
+                fTable = dynamic_cast<CCfits::Table*>(extMap.find(factTableName)->second);
+            }
+            if (!fTable)
+            {
+                fMess->Error("The table " + factTableName + " could not be created nor loaded. skipping it");
+                return;
+            }
+            fTable->makeThisCurrent();
                 fCopyBuffer = new unsigned char[fTotalNumBytes]; 
                 fNumRows = fTable->rows();
@@ -178 +197 @@
                         updating = true;
                 }
+
         }
         catch(CCfits::FitsException e)
@@ -301 +321 @@
         WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data");
         if (fFile != NULL && fOwner)
-                delete fFile;
+        {
+//          fFile->flush();
+            delete fFile;
+        }
         fFile = NULL;
         if (fCopyBuffer != NULL)