Changeset 11818

Timestamp:

08/06/11 16:38:12 (13 years ago)

Author:

tbretz

Message:

Added ReadFits.

Location:

trunk/FACT++/src

Files:

• DataCalib.cc (modified) (6 diffs)
• DataCalib.h (modified) (2 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -112 +112 @@
 }
 
-bool DataCalib::ReadFits(const string &str)
+bool DataCalib::ReadFits(const string &str, MessageImp &msg)
 {
     try
@@ -122 +122 @@
         if (file.GetStr("TELESCOP")!="FACT")
         {
-            Error("Reading "+str+" failed: Not a valid FACT file (TELESCOP not FACT in header)");
+            msg.Error("Reading "+str+" failed: Not a valid FACT file (TELESCOP not FACT in header)");
             return false;
         }
@@ -128 +128 @@
         if (!file.HasKey("STEP"))
         {
-            Error("Reading "+str+" failed: Is not a DRS calib file (STEP not found in header)");
+            msg.Error("Reading "+str+" failed: Is not a DRS calib file (STEP not found in header)");
             return false;
         }
@@ -134 +134 @@
         if (file.GetNumRows()!=1)
         {
-            Error("Reading "+str+" failed: Number of rows in table is not 1.");
+            msg.Error("Reading "+str+" failed: Number of rows in table is not 1.");
             return false;
         }
@@ -154 +154 @@
         if (!file.GetNextRow())
         {
-            Error("Reading data from "+str+" failed.");
+            msg.Error("Reading data from "+str+" failed.");
             return false;
         }
@@ -166 +166 @@
     catch (const runtime_error &e)
     {
-        Error("Exception reading "+str+": "+e.what());
+        msg.Error("Exception reading "+str+": "+e.what());
         return false;
     }

trunk/FACT++/src/DataCalib.h

@@ -28 +28 @@
     DimDescribedService &fDim; // DimService through which statistics updates are transmitted
 
-    bool ReadFits(const string &fname);
     void WriteFits();
 
@@ -45 +44 @@
     static void Apply(int16_t *val, const int16_t *start, uint32_t roi);
     static void Apply(float *vec, int16_t *val, const int16_t *start, uint32_t roi);
+
+    static bool ReadFits(const string &fname, MessageImp &msg);
 };