Changeset 14000 for trunk

Timestamp:

05/31/12 16:36:45 (12 years ago)

Author:

tbretz

Message:

Exchanged the enum definitions for the cfitsio based fits format and our fits format; replaced the cfitsio based on with the new one in DataCalib.

Location:

trunk/FACT++/src

Files:

• DataCalib.cc (modified) (3 diffs)
• DataCalib.h (modified) (3 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -164 +164 @@
     fData.fNumTm = hastm ? 160 : 0;
 
-    return DataWriteFits::Open(h, d);
+    return DataWriteFits2::Open(h, d);
 }
 
@@ -184 +184 @@
     }
 
-    return DataWriteFits::WriteEvt(e);
+    return DataWriteFits2::WriteEvt(e);
 }
 
@@ -343 +343 @@
     fProcessing = false;
 
-    return DataWriteFits::Close(tail);
-}
+    return DataWriteFits2::Close(tail);
+}

trunk/FACT++/src/DataCalib.h

@@ -2 +2 @@
 #define FACT_DataCalib
 
-#include "DataWriteFits.h"
+#include "DataWriteFits2.h"
 #include "externals/DrsCalib.h"
 
@@ -9 +9 @@
 using namespace std;
 
-class DataCalib : public DataWriteFits, public DrsCalibrate
+class DataCalib : public DataWriteFits2, public DrsCalibrate
 {
     static DrsCalibration fData;
@@ -29 +29 @@
 
 public:
-    DataCalib(const std::string &path, uint32_t id, DimDescribedService &dim, DimDescribedService &runs, MessageImp &imp) : DataWriteFits(path, id, imp), fDim(dim), fDimRuns(runs)
+    DataCalib(const std::string &path, uint32_t id, DimDescribedService &dim, DimDescribedService &runs, MessageImp &imp) : DataWriteFits2(path, id, imp), fDim(dim), fDimRuns(runs)
     {
     }