Changeset 2756 for trunk/src/Calibrator.cpp

Timestamp:

01/31/13 18:55:29 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdcal2

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Replace assert with casa::assert_ to avoid aborting casapy session.

File:

• trunk/src/Calibrator.cpp (modified) (4 diffs)

trunk/src/Calibrator.cpp

@@ -14 +14 @@
 #include <casa/Arrays/Vector.h>
 #include <casa/Exceptions/Error.h>
+#include <casa/Utilities/Assert.h>
 
 #include "Calibrator.h"
@@ -71 +72 @@
 void Calibrator::setReference(Vector<Float> &v)
 {
-  assert(v.nelements() == nchan_);
+  //assert(v.nelements() == nchan_);
+  assert_<AipsError>(v.nelements() == nchan_, "Reference spectrum shape mismatch.");
   set(ref_, v);
 }
@@ -77 +79 @@
 void Calibrator::setReference2(Vector<Float> &v)
 {
-  assert(v.nelements() == nchan_);
+  //assert(v.nelements() == nchan_);
+  assert_<AipsError>(v.nelements() == nchan_, "Second reference spectrum shape mismatch.");
   if (!ref2_)
     ref2_ = new Float[nchan_];
@@ -85 +88 @@
 void Calibrator::setScaler(Vector<Float> &v)
 {
-  assert(v.nelements() == nchan_ || v.nelements() == 1);
+  //assert(v.nelements() == nchan_ || v.nelements() == 1);
+  assert_<AipsError>(v.nelements() == nchan_ || v.nelements() == 1,
+         "Scaling factor shape mismatch.");
   if (nchanS_ == 0) {
     nchanS_ = v.nelements();