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

trunk/src/CalibrationManager.cpp

@@ -14 +14 @@
 #include <casa/Arrays/Vector.h>
 #include <casa/Exceptions/Error.h>
+#include <casa/Utilities/Assert.h>
 #include <casa/Utilities/Regex.h>
 #include <casa/BasicSL/String.h>
@@ -150 +151 @@
   os_.origin(LogOrigin("CalibrationManager","calibrate",WHERE));
   os_ << LogIO::DEBUGGING << "start calibration with mode " << calmode_ << "." << LogIO::POST;
-  assert(!target_.null());
+  //assert(!target_.null());
+  assert_<AipsError>(!target_.null(), "You have to set target scantable first.");
   if (calmode_ == "TSYS") {
-    assert(spwlist_.size() > 0);
+    //assert(spwlist_.size() > 0);
+    assert_<AipsError>(spwlist_.size() > 0, "You have to set list of IFNOs for ATM calibration.");
     STCalTsys cal(target_, spwlist_);
     cal.calibrate();
@@ -198 +201 @@
   os_.origin(LogOrigin("CalibrationManager","saveCaltable",WHERE));
   if (calmode_ == "TSYS") {
-    assert(tsystables_.size() > 0);
+    //assert(tsystables_.size() > 0);
+    assert_<AipsError>(tsystables_.size() > 0, "Tsys table list is empty.");
     os_ << LogIO::DEBUGGING << "save latest STCalTsysTable as " << name << "." << LogIO::POST;
     tsystables_[tsystables_.size()-1]->save(name);
   }
   else {
-    assert(skytables_.size() > 0);
+    //assert(skytables_.size() > 0);
+    assert_<AipsError>(skytables_.size() > 0, "Sky table list is empty.");
     os_ << LogIO::DEBUGGING << "save latest STCalSkyTable as " << name << "." << LogIO::POST;
     skytables_[skytables_.size()-1]->save(name);