Changeset 17008 for trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

Timestamp:

08/15/13 08:18:23 (11 years ago)

Author:

lyard

Message:

unified support for both .gz and .fz files in the viewer

File:

• trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (2 diffs)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -561 +561 @@
     }
     vector<string> entriesToCheck;
-    entriesToCheck.push_back("NAXIS2");
+    if (inputFile->IsCompressedFITS())
+        entriesToCheck.push_back("ZNAXIS2");
+    else
+        entriesToCheck.push_back("NAXIS2");
     entriesToCheck.push_back("NROI");
     entriesToCheck.push_back("REVISION");
@@ -591 +594 @@
     }
 
-    nRows =          inputFile->HasKey("NAXIS2") ? inputFile->GetInt("NAXIS2") : 0;
+    nRows = 0;
+    if (inputFile->IsCompressedFITS())
+        nRows = inputFile->HasKey("ZNAXIS2") ? inputFile->GetInt("ZNAXIS2") : 0;
+    else
+        nRows = inputFile->HasKey("NAXIS2") ? inputFile->GetInt("NAXIS2") : 0;
     nRoi =           inputFile->HasKey("NROI") ?  inputFile->GetInt("NROI") : 0;
     runNumber =      inputFile->HasKey("RUNID") ?  inputFile->GetInt("RUNID") : -1;