Changeset 18144

Timestamp:

02/18/15 12:07:29 (10 years ago)

Author:

tbretz

Message:

Accounted for the change in exception handling.

Location:

trunk/Mars/mdrs

Files:

• MDrsCalibration.h (modified) (1 diff)
• MDrsCalibrationTime.cc (modified) (2 diffs)

trunk/Mars/mdrs/MDrsCalibration.h

@@ -30 +30 @@
     }
 
-    bool ReadFits(TString str)
+    bool ReadFits(const TString &str)
     {
         gSystem->ExpandPathName(str);
 
-        const std::string msg = ReadFitsImp(str.Data());
+        string msg;
+        try
+        {
+            msg = ReadFitsImp(str.Data());
+        }
+        catch (const exception &e)
+        {
+            msg = e.what();
+        }
+
         if (msg.empty())
+        {
+            *fLog << inf << "Read DRS calibration file " << fname << endl;
             return true;
+        }
 
-        *fLog << err << msg << std::endl;
+        *fLog << err << "Error reading from " << fname << ": " << msg << endl;
         return false;
     }

trunk/Mars/mdrs/MDrsCalibrationTime.cc

@@ -51 +51 @@
 bool MDrsCalibrationTime::ReadFits(const string &fname)
 {
-    const std::string msg = DrsCalibrateTime::ReadFitsImp(fname);
+    string msg;
+    try
+    {
+        msg = DrsCalibrateTime::ReadFitsImp(fname);
+    }
+    catch (const exception &e)
+    {
+        msg = e.what();
+    }
+
     if (msg.empty())
     {
-        *fLog << inf << "Wrote DRS calibration file " << fname << endl;
-        return kTRUE;
+        *fLog << inf << "Read DRS calibration file " << fname << endl;
+        return true;
     }
 
-    *fLog << err << "Error writing to " << fname << ": " << msg << endl;
-    return kFALSE;
+    *fLog << err << "Error reading from " << fname << ": " << msg << endl;
+    return false;
 }
 
@@ -68 +77 @@
     {
         *fLog << err << "File '" << fname << "' already exists." << endl;
-        return kFALSE;
+        return false;
     }
 
-    const std::string msg = DrsCalibrateTime::WriteFitsImp(fname);
+    string msg;
+    try
+    {
+        msg = DrsCalibrateTime::WriteFitsImp(fname);
+    }
+    catch (const exception &e)
+    {
+        msg = e.what();
+    }
+
     if (msg.empty())
     {
         *fLog << inf << "Wrote DRS calibration file " << fname << endl;
-        return kTRUE;
+        return true;
     }
 
     *fLog << err << "Error writing to " << fname << ": " << msg << endl;
-    return kFALSE;
+    return false;
 }