Changeset 3020 for trunk

Timestamp:

12/15/14 17:26:43 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-7193

Ready for Test: Yes

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for segmentation fault when invalid Tsys table is applied.

Location:

trunk/src

Files:

• Locator.tcc (modified) (2 diffs)
• STApplyCal.cpp (modified) (2 diffs)

trunk/src/Locator.tcc

@@ -11 +11 @@
 //
 #include <assert.h>
+#include <iostream>
+#include <stdexcept>
 
 #include "Locator.h"
@@ -57 +59 @@
     x_ = v;
   }
+  assert(n_ > 0);
+  if (n_ == 0) {
+    throw std::runtime_error("Input array length is 0.");
+  }
   ascending_ = (x_[0] <= x_[n_-1]);
 }

trunk/src/STApplyCal.cpp

@@ -507 +507 @@
                                      timeTsys, tsys, flagtsys);
     nrowTsys = timeTsys.nelements();
+
+    if (allNE(flagtsys, (uChar)0)) {
+      os_ << LogIO::WARN << "No valid Tsys measurement. Skip Tsys calibration." << LogIO::POST;
+      doTsys = False;
+    }
   }
 
@@ -574 +579 @@
         uInt wnchan = setupWorkingData(nchanTsys, ftsys.data(), iTsysT.data(),
                                        fwork_p, xwork_p, ywork_p);
+        assert(wnchan > 0);
+        if (wnchan == 0) {
+          throw AipsError("No valid Tsys measurements.");
+        }
         interpolatorF_->setData(xwork_p, ywork_p, wnchan);
-        for (uInt ichan = 0; ichan < nchanSp; ichan++) {
+        for (uInt ichan = 0; ichan < nchanSp; ichan++) {
           iTsys[ichan] = interpolatorF_->interpolate(fsp[ichan]);
         }