Changeset 17291

Timestamp:

10/21/13 13:36:11 (11 years ago)

Author:

lyard

Message:

BugFixed fitsdump to display the correct num of rows also for compressed tables

File:

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

trunk/FACT++/src/fitsdump.cc

@@ -132 +132 @@
 
     cout << " " << fKeyMap.find("EXTNAME")->second.value << " [";
-    cout << fKeyMap.find("NAXIS2")->second.value << "]\n";
+    cout << GetNumRows() << "]\n";
 
     for (auto it = fColMap.begin(); it != fColMap.end(); it++)
@@ -218 +218 @@
     const fits::Table::Keys &fKeyMap = GetKeys();
 
-    fout << "\nTable: " << fKeyMap.find("EXTNAME")->second.value << " (rows=" << fKeyMap.find("NAXIS2")->second.value << ")\n";
+    fout << "\nTable: " << fKeyMap.find("EXTNAME")->second.value << " (rows=" << GetNumRows() << ")\n";
     if (fKeyMap.find("COMMENT") != fKeyMap.end())
         fout << "Comment: \t" << fKeyMap.find("COMMENT")->second.value << "\n";
@@ -448 +448 @@
         fout << "## File:      \t" << filename << '\n';
     fout << "## Table:     \t" << fKeyMap.find("EXTNAME")->second.value << '\n';
-    fout << "## NumRows:   \t" << GetInt("NAXIS2") << '\n';
+    fout << "## NumRows:   \t" << GetNumRows() << '\n';
     fout << "## Comment:   \t" << ((fKeyMap.find("COMMENT") != fKeyMap.end()) ? fKeyMap.find("COMMENT")->second.value : "") << '\n';
 #ifdef HAVE_ROOT
@@ -680 +680 @@
         fout << "## File:      \t" << filename << '\n';
     fout << "## Table:     \t" << fKeyMap.find("EXTNAME")->second.value << '\n';
-    fout << "## NumRows:   \t" << GetInt("NAXIS2") << '\n';
+    fout << "## NumRows:   \t" << GetNumRows() << '\n';
     fout << "## Comment:   \t" << ((fKeyMap.find("COMMENT") != fKeyMap.end()) ? fKeyMap.find("COMMENT")->second.value : "") << '\n';
     fout << "## --------------------------------------------------------------------------\n";