Changeset 2756 for trunk/src/PSAlmaCalibrator.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/PSAlmaCalibrator.cpp (modified) (2 diffs)

trunk/src/PSAlmaCalibrator.cpp

@@ -11 +11 @@
 //
 #include <assert.h>
+
+#include <casa/Exceptions/Error.h>
+#include <casa/Utilities/Assert.h>
 
 #include "PSAlmaCalibrator.h"
@@ -28 +31 @@
 void PSAlmaCalibrator::calibrate()
 {
-  assert(source_);
-  assert(ref_);
-  assert(scaler_);
-  assert(calibrated_);
+  //assert(source_);
+  //assert(ref_);
+  //assert(scaler_);
+  //assert(calibrated_);
+  assert_<AipsError>(source_, "Source spectrum is null.");
+  assert_<AipsError>(ref_, "Reference spectrum is null.");
+  assert_<AipsError>(scaler_, "Scaling factor is null.");
+  assert_<AipsError>(calibrated_, "Calibrated spectrum is null.");
 
   Float *p_s = source_;