Changeset 12747 for trunk/FACT++

Timestamp:

01/17/12 09:03:20 (13 years ago)

Author:

lyard

Message:

put fitsdump in line with fits.h

File:

• trunk/FACT++/src/fitsdump.cc (modified) (4 diffs)

trunk/FACT++/src/fitsdump.cc

@@ -195 +195 @@
     fFilename = filename;
 
-    const fits::Table::Columns& tCols = fFile->getColumns();
+    const fits::Table::Columns& tCols = fFile->GetColumns();
 
     for (auto it=tCols.begin(); it != tCols.end(); it++)
         fColMap.insert(*it);
 
-    const fits::Table::Keys& tkeys = fFile->getKeys();
+    const fits::Table::Keys& tkeys = fFile->GetKeys();
 
     for (auto it=tkeys.begin(); it != tkeys.end(); it++)
@@ -666 +666 @@
                     ;
             }
-            if (list.size() == 1 && list[0] == "UnixTimeUTC")
+            if (list.size() == 1 && (list[0] == "UnixTimeUTC" || list[0] == "PCTime"))
             {
                 if (i==0)
@@ -1093 +1093 @@
 
       //add the time column to the given columns
-      if (fColMap.find("Time") == fColMap.end() && fColMap.find("UnixTimeUTC") == fColMap.end())
+      if (fColMap.find("Time") == fColMap.end() && 
+          fColMap.find("UnixTimeUTC") == fColMap.end())
       {
           cerr << "Error: time column could not be found in given table. Aborting" << endl;
@@ -1175 +1176 @@
               Time mjdTime(unixTimeT);
               yValues[i-1] = mjdTime.Mjd();
+              if (yValues[i-1] < 40587)
+                yValues[i-1] += 40587;
           }
           else