Changeset 16964

Timestamp:

07/19/13 09:07:03 (11 years ago)

Author:

lyard

Message:

replaced fits with fact fits to be able to read compressed files

Location:

trunk/FACT++

Files:

• gui/RawEventsViewer/RawEventsViewer.cc (modified) (3 diffs)
• src/fitsdump.cc (modified) (5 diffs)

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

@@ -23 +23 @@
 
 #include "src/Configuration.h"
-#include "externals/fits.h"
+#include "externals/factfits.h"
 
 
@@ -547 +547 @@
     }
     try {
-    inputFile = new fits(file);
+    inputFile = new factfits(file, "Events");
     }
     catch (std::runtime_error e)
@@ -2220 +2220 @@
         "The FACT++ raw data viewer.\n"
         "\n"
-        "Usage: viewer [OPTIONS] [datafile.fits[.gz] [calibration.drs.fits[.gz]]]\n"
+        "Usage: viewer [OPTIONS] [datafile.fits[.gz|.fz] [calibration.drs.fits[.gz]]]\n"
         "  or:  viewer [OPTIONS]\n";
     cout << endl;

trunk/FACT++/src/fitsdump.cc

@@ -16 +16 @@
 
 #include "Time.h"
-#include "externals/zfits.h"
+#include "externals/factfits.h"
 
 #ifdef HAVE_ROOT
@@ -61 +61 @@
 
 
-class FitsDumper : public zfits
+class FitsDumper : public factfits
 {
 private:
@@ -98 +98 @@
 //!        the ostream where to redirect the outputs
 //
-FitsDumper::FitsDumper(const string &fname) : zfits(fname), fFilename(fname)
+FitsDumper::FitsDumper(const string &fname) : factfits(fname, "Events"), fFilename(fname)
 {
 }
@@ -818 +818 @@
     const size_t limit  = conf.Get<size_t>("limit");
 
+#ifdef HAVE_ROOT
     if (conf.Get<bool>("root"))
     {
@@ -823 +824 @@
         return 0;
     }
+#endif
 
     const vector<MyColumn> cols = InitColumns(conf.Vec<string>("col"));