Changeset 18148 for trunk/Mars

Timestamp:

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

Author:

tbretz

Message:

std namespace missing; expand path name; consequently argument must not be const

Location:

trunk/Mars/mdrs

Files:

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

trunk/Mars/mdrs/MDrsCalibration.h

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

trunk/Mars/mdrs/MDrsCalibrationTime.cc

@@ -49 +49 @@
 }
 
-bool MDrsCalibrationTime::ReadFits(const string &fname)
+bool MDrsCalibrationTime::ReadFits(TString fname)
 {
+    gSystem->ExpandPathName(fname);
+
     string msg;
     try
     {
-        msg = DrsCalibrateTime::ReadFitsImp(fname);
+        msg = DrsCalibrateTime::ReadFitsImp(fname.Data());
     }
     catch (const exception &e)

trunk/Mars/mdrs/MDrsCalibrationTime.h

@@ -47 +47 @@
     }
 
-    bool ReadFits(const std::string &fname);
+    bool ReadFits(TString fname);
     bool WriteFits(const std::string &fname) const;