Changeset 1929 for trunk/src

Timestamp:

09/17/10 17:02:28 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: s=sd.scantable('sddata()

s.nbeam(999) # unexisting scan number
s.ncycle(999)
s.nif(999)
s.npol(999)

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed a bug in nbeam, ncycle, nif, and npol that causes seg fault.

File:

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

trunk/src/Scantable.cpp

@@ -543 +543 @@
     // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
     Table t = table_(table_.col("SCANNO") == scanno);
+    if ( t.nrow() == 0 ) return 0 ;
     ROTableRow row(t);
     const TableRecord& rec = row.get(0);
@@ -563 +564 @@
     // take the first POLNO,BEAMNO,CYCLENO as nbeam shouldn't vary with these
     Table t = table_(table_.col("SCANNO") == scanno);
+    if ( t.nrow() == 0 ) return 0 ;
     ROTableRow row(t);
     const TableRecord& rec = row.get(0);
@@ -584 +586 @@
     // take the first POLNO,IFNO,CYCLENO as nbeam shouldn't vary with these
     Table t = table_(table_.col("SCANNO") == scanno);
+    if ( t.nrow() == 0 ) return 0 ;
     ROTableRow row(t);
     const TableRecord& rec = row.get(0);
@@ -611 +614 @@
   } else {
     Table t = table_(table_.col("SCANNO") == scanno);
+    if ( t.nrow() == 0 ) return 0 ;
     ROTableRow row(t);
     const TableRecord& rec = row.get(0);