Changeset 14169 for trunk

Timestamp:

06/13/12 14:25:42 (12 years ago)

Author:

tbretz

Message:

Improved some error messages.

File:

• trunk/FACT++/src/DataCalib.cc (modified) (6 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -85 +85 @@
     if (h->NPix != 1440)
     {
-        fMsg.Error("Number of pixels in header for run " << GetRunId() << " not 1440.");
+        Error("Number of pixels in header for run "+to_string(GetRunId())+" not 1440.");
         return false;
     }
@@ -91 +91 @@
     if (fProcessing)
     {
-        fMsg.Warn("Previous DRS calibration run not yet finished (current run " << GetRunId() << ")");
+        Warn("Previous DRS calibration run not yet finished (current run "+to_string(GetRunId())+")");
         return false;
     }
@@ -97 +97 @@
     if (fData.fStep==3)
     {
-        fMsg.Warn("DRS Calibration already finished before current run " << GetRunId() << "... please restart!");
+        Warn("DRS Calibration already finished before current run "+to_string(GetRunId())+"... please restart!");
         return false;
     }
@@ -105 +105 @@
         ostringstream msg;
         msg << "Region of interest of run " << GetRunId() << " not 1024, but " << h->Nroi << " in step " << fData.fStep <<  " ... as it ought to be.";
-        fMsg.Error(msg);
+        Error(msg);
         return false;
     }
@@ -218 +218 @@
     const size_t n = 1440*1024*4 + 1440*roi*2 + ntm*roi*2 + 3;
 
-    if (vec.size()!=n+1)
-        throw runtime_error("Size of vector does not match region-of-interest");
+    // The vector has a fixed size
+    //if (vec.size()!=n+1)
+    //    throw runtime_error("Size of vector does not match region-of-interest");
 
     ofits file(filename.c_str());
@@ -265 +266 @@
     {
         ostringstream str;
-        str << "DRS calibration run (run=" << GetRunId() << ", step=" << fData.fStep << ", roi=" << roi << ") has 0 events.";
+        str << "DRS calibration run (run=" << GetRunId() << ", step=" << fData.fStep << ", roi=" << fData.fRoi << ") has 0 events.";
         Warn(str);
     }