Changeset 2594

Timestamp:

07/11/12 10:22:40 (12 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: sdgrid unit test with sd.rcParamsscantable.storage?='memory'

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on STGrid2.

Location:

trunk

Files:

• python/asapgrid.py (modified) (1 diff)
• src/STGrid.cpp (modified) (3 diffs)
• src/STGrid.h (modified) (1 diff)

trunk/python/asapgrid.py

@@ -406 +406 @@
         Return gridded data as a scantable.
         """
-        return scantable( self.gridder._get(), average=False )
+        tp = 0 if rcParams['scantable.storage']=='memory' else 1
+        return scantable( self.gridder._get( tp ), average=False )
 
 class _SDGridPlotter:

trunk/src/STGrid.cpp

@@ -1724 +1724 @@
 {
   // values for fill
-  Table t( infileList_[0], Table::Old ) ;
+  //Table t( infileList_[0], Table::Old ) ;
+  Table t ;
+  table( t, 0 ) ;
   Table tsel = t( t.col( "IFNO" ) == (uInt)ifno_, 1 ) ;
   ROTableRow row( tsel ) ;
@@ -1832 +1834 @@
 }
 
-ScantableWrapper STGrid2::getResultAsScantable()
-{
-  CountedPtr<Scantable> s = new Scantable( Table::Plain ) ;
+ScantableWrapper STGrid2::getResultAsScantable( int tp )
+{
+  Table::TableType ttype = (tp==0) ? Table::Memory : Table::Plain ;
+  ScantableWrapper sw( ttype ) ;
+  CountedPtr<Scantable> s = sw.getCP() ;
   s->setHeader( dataList_[0].getCP()->getHeader() ) ;
   Table tout, tin ;
@@ -1845 +1849 @@
   }
   fillTable( s->table() ) ;
-  ScantableWrapper sw( s ) ;
   return sw ;
 }

trunk/src/STGrid.h

@@ -273 +273 @@
   void selectData() ;
   virtual void table( Table &tab, uInt i ) ;
-  ScantableWrapper getResultAsScantable() ;
+  ScantableWrapper getResultAsScantable( int tp ) ;
 
 private: