Changeset 11616

Timestamp:

07/26/11 15:23:10 (13 years ago)

Author:

tbretz

Message:

Changed from using MFits.h to new fits.h in Mars trunk.

File:

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

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

@@ -7 +7 @@
 
 #include "RawEventsViewer.h"
-#include "RawEventsViewerUi.h"
+#include "viewer.h"
 #include <math.h>
 #include <fstream>
@@ -837 +837 @@
 }
 /************************************************************
- * IS FITS. checks if a given file is a fits file.
- ************************************************************/
-bool RawDataViewer::IsFits(const char *name)
-{
-    MZlib fin(name);
-    if (!fin)
-        return 0;
-
-    unsigned char c[6];
-    fin.read((char*)c, 6);
-    if (!fin)
-        return 0;
-
-    return memcmp(c, "SIMPLE", 6)==0;
-}
-/************************************************************
  * OPEN FILE. opens a new fits file
  ************************************************************/
 void RawDataViewer::openFile(string& file)
 {
-    if (!IsFits(file.c_str()))
-    {
-        cout << "File does not seem to be fits. aborting" << endl;
-        return;
-    }
     if (inputFile)
     {
@@ -867 +846 @@
         delete inputFile;
     }
-    inputFile = new MFits(file);
+    inputFile = new fits(file);
+    if (!*inputFile)
+    {
+        cout << "Couldn't open file." << endl;
+        delete inputFile;
+        inputFile = NULL;
+        return;
+    }
     nRows = inputFile->GetInt("NAXIS2");
     nRoi = inputFile->GetInt("NROI");