Changeset 14024 for trunk

Timestamp:

06/01/12 16:13:10 (12 years ago)

Author:

tbretz

Message:

Some exception handling around WriteFits

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/DataCalib.cc

@@ -211 +211 @@
 }
 
-void DataCalib::WriteFits()
-{
-    // EXCEPTION HANDLEING!
-    const string filename = FormFileName("drs.fits");
-
+void DataCalib::WriteFits(const string &filename)
+{
     ofits file(filename.c_str());
 
@@ -258 +255 @@
     const int n = (1440*1024*4 + 1440*roi*2 + ntm*roi*2 + 3)*sizeof(float);
     file.WriteRow(fStats.data()+1, n);
-
-    ostringstream str;
-    str << "Wrote DRS calibration data (step=" << fData.fStep << ", roi=" << roi << ") to '" << filename << "'";
-    Info(str.str());
 }
 
@@ -308 +301 @@
 
     if (fData.fStep<=2)
-        WriteFits();
+    {
+        const string filename = FormFileName("drs.fits");
+        try
+        {
+            WriteFits(filename);
+
+            ostringstream str;
+            str << "Wrote DRS calibration data (step=" << fData.fStep << ", roi=" << fData.fRoi << ") to '" << filename << "'";
+            Info(str);
+        }
+        catch (const exception &e)
+        {
+            Error("Exception writing '"+filename+"': "+e.what());
+        }
+    }
 
     Update(fDim, fDimRuns);

trunk/FACT++/src/DataCalib.h

@@ -24 +24 @@
 //    uint16_t fDAC[8];
 
-    void WriteFits();
+    void WriteFits(const std::string &filename);
 
     int GetDrsStep() const { return fData.fStep; }