Changeset 2348

Timestamp:

11/11/11 14:09:03 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a bug fix related to CAS-3606)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: all SD unit and regression tests passed

Put in Release Notes: No

Module(s): asap.scantable and asap.asapmath

Description: spceified ifno parameter in some of the calls to scantable.nchan.

Location:

trunk

Files:

• python/asapmath.py (modified) (3 diffs)
• python/scantable.py (modified) (3 diffs)
• src/Scantable.cpp (modified) (2 diffs)

trunk/python/asapmath.py

@@ -357 +357 @@
             ymin=1.0e100
             ymax=-1.0e100
-            nchan=s.nchan()
+            nchan=s.nchan(ifnos[int(i/len(polnos))])
             edge=int(nchan*0.01)
             for j in range(4):
@@ -577 +577 @@
             ymin=1.0e100
             ymax=-1.0e100
-            nchan=scantab.nchan()
+            nchan=scantab.nchan(ifnos[int(i/len(polnos))])
             edge=int(nchan*0.01)
             for j in range(4):
@@ -770 +770 @@
             ymin=1.0e100
             ymax=-1.0e100
-            nchan=s.nchan()
+            nchan=s.nchan(ifnos[2*int(i/len(polnos))])
             edge=int(nchan*0.01)
             for j in range(4):

trunk/python/scantable.py

@@ -504 +504 @@
 
         """
-        assert(len(spec) == self.nchan())
+        assert(len(spec) == self.nchan(self.getif(rowno)))
         return self._setspectrum(spec, rowno)
 
@@ -1370 +1370 @@
             msg += "\nThis mask is only valid for IF=%d" % (self.getif(i))
         asaplog.push(msg)
-        n = self.nchan()
+        n = len(data)
         msk = _n_bools(n, False)
         # test if args is a 'list' or a 'normal *args - UGLY!!!
@@ -1416 +1416 @@
         if len(mask) < 2:
             raise TypeError("The mask elements should be > 1")
-        if self.nchan() != len(mask):
+        data = self._getabcissa(row)
+        if len(data) != len(mask):
             msg = "Number of channels in scantable != number of mask elements"
             raise TypeError(msg)
-        data = self._getabcissa(row)
         u = self._getcoordinfo()[0]
         if u == "":

trunk/src/Scantable.cpp

@@ -773 +773 @@
 {
     Vector<Float> spcs = specCol_(whichrow);
-    uInt nchannel = nchan();
+    uInt nchannel = spcs.nelements();
     if (spcs.nelements() != nchannel) {
       throw(AipsError("Data has incorrect number of channels"));
@@ -837 +837 @@
     return;
   }
-  if ( int(msk.size()) != nchan() ) {
+  if ( int(msk.size()) != nchan( getIF(whichrow) ) ) {
     throw(AipsError("Mask has incorrect number of channels."));
   }