Changeset 2004 for trunk/python

Timestamp:

02/22/11 20:24:33 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes .CAS-2718

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

The MSFiller is called instead of PKSFiller when input data is MS.
I have tested all task regressions as well as sdsave unit test and passed.

A few modification was needed for STMath::dototalpower() and
STWriter::write().

File:

• trunk/python/scantable.py (modified) (4 diffs)

trunk/python/scantable.py

@@ -10 +10 @@
 from asap.env import is_casapy
 from asap._asap import Scantable
-from asap._asap import filler
+from asap._asap import filler, msfiller
 from asap.parameters import rcParams
 from asap.logging import asaplog, asaplog_post_dec
@@ -232 +232 @@
         if format2 == 'ASAP':
             self._save(name)
+##         elif format2 == 'MS2':
+##             msopt = {'ms': {'overwrite': overwrite } }
+##             from asap._asap import mswriter
+##             writer = mswriter( self )
+##             writer.write( name, msopt ) 
         else:
             from asap._asap import stwriter as stw
@@ -2687 +2692 @@
     def _check_ifs(self):
         #nchans = [self.nchan(i) for i in range(self.nif(-1))]
-        #nchans = filter(lambda t: t > 0, nchans)
         nchans = [self.nchan(i) for i in self.getifnos()]
+        nchans = filter(lambda t: t > 0, nchans)
         return (sum(nchans)/len(nchans) == nchans[0])
 
@@ -2708 +2713 @@
         for name in fullnames:
             tbl = Scantable(stype)
-            r = filler(tbl)
-            rx = rcParams['scantable.reference']
-            r.setreferenceexpr(rx)
+            if is_ms( name ):
+                r = msfiller( tbl )
+            else:
+                r = filler( tbl )
+                rx = rcParams['scantable.reference']
+                r.setreferenceexpr(rx)
+            #r = filler(tbl)
+            #rx = rcParams['scantable.reference']
+            #r.setreferenceexpr(rx)
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)