Changeset 2364

Timestamp:

12/08/11 18:31:00 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: No

Interface Changes: Yes

What Interface Changed: see below

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): sdgrid task

Description: Describe your changes here...

• setOption is renamed to setFunc
• Implemented selection by SCANNO
• Disabled to extend grid area for edge treatment
• Added message for performance check

Location:

trunk

Files:

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

trunk/python/asapgrid.py

@@ -19 +19 @@
         self.gridder._setpollist( pollist )
 
+    def setScanList( self, scanlist ):
+        self.gridder._setscanlist( scanlist )
+
     def defineImage( self, nx=-1, ny=-1, cellx='', celly='', center='' ):
         self.gridder._defineimage( nx, ny, cellx, celly, center )
 
-    def setOption( self, convType='box', width=-1 ):
-        self.gridder._setoption( convType, width )
+    def setFunc( self, func='box', width=-1 ):
+        self.gridder._setfunc( func, width )
 
     def setWeight( self, weightType='uniform' ):

trunk/src/STGrid.cpp

@@ -22 +22 @@
 
 #include <Scantable.h>
+#include <MathUtils.h>
+
 #include "STGrid.h"
 
@@ -72 +74 @@
 void STGrid::setPolList( vector<unsigned int> pols )
 {
-  //pollist_ = Vector<uInt>( pols ) ;
   pollist_.assign( Vector<uInt>( pols ) ) ;
   cout << "pollist_ = " << pollist_ << endl ;
+}
+
+void STGrid::setScanList( vector<unsigned int> scans )
+{
+  scanlist_.assign( Vector<uInt>( scans ) ) ;
+  cout << "scanlist_ = " << scanlist_ << endl ;
 }
 
@@ -108 +115 @@
 }
   
-void STGrid::setOption( string convType,
-                        int convSupport ) 
+void STGrid::setFunc( string convType,
+                      int convSupport ) 
 {
   convType_ = String( convType ) ;
@@ -154 +161 @@
   Matrix<uInt> rflag ;
   Matrix<Float> weight ;
+  double t0, t1 ;
+  t0 = mathutil::gettimeofday_sec() ;
   getData( spectra, direction, flagtra, rflag, weight ) ;
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "getData: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
   IPosition sshape = spectra.shape() ;
   //os << "spectra.shape()=" << spectra.shape() << LogIO::POST ;
@@ -164 +175 @@
   Cube<Int> flagI ;
   Matrix<Int> rflagI ;
+  t0 = mathutil::gettimeofday_sec() ;
   toInt( &flagtra, &flagI ) ;
   toInt( &rflag, &rflagI ) ;
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "toInt: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
   
   // grid parameter
@@ -179 +193 @@
   // convolution kernel
   Vector<Float> convFunc ;
+  t0 = mathutil::gettimeofday_sec() ;
   setConvFunc( convFunc ) ;
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "setConvFunc: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
   //cout << "convSupport=" << convSupport_ << endl ;
   //cout << "convFunc=" << convFunc << endl ;
@@ -185 +202 @@
   // world -> pixel
   Matrix<Double> xypos( direction.shape(), 0.0 ) ;
+  t0 = mathutil::gettimeofday_sec() ;
   toPixel( direction, xypos ) ;  
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "toPixel: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
   
   // call ggridsd
@@ -198 +218 @@
   Float *conv_p = convFunc.getStorage( deleteConv ) ;
   // Extend grid plane with convSupport_
-  //IPosition gshape( 4, nx_, ny_, npol, nchan ) ;
-  Int gnx = nx_+convSupport_*2 ;
-  Int gny = ny_+convSupport_*2 ;
+  Int gnx = nx_ ;
+  Int gny = ny_ ;
+//   Int gnx = nx_+convSupport_*2 ;
+//   Int gny = ny_+convSupport_*2 ;
   IPosition gshape( 4, gnx, gny, npol_, nchan_ ) ;
   Array<Complex> gdataArrC( gshape, 0.0 ) ;
@@ -207 +228 @@
   Float *wdata_p = gwgtArr.getStorage( deleteWgtG ) ;
   Int idopsf = 0 ;
-  Int irow = -1 ;
   Int *chanMap = new Int[nchan_] ;
   {
@@ -232 +252 @@
     }
   }
+  t0 = mathutil::gettimeofday_sec() ;
+  Int irow = -1 ;
   ggridsd( xypos_p,
            data_p,
@@ -254 +276 @@
            polMap,
            sumw_p ) ;
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "ggridsd: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
   xypos.putStorage( xypos_p, deletePos ) ;
   dataC.freeStorage( data_p, deleteData ) ;
@@ -265 +289 @@
   gwgtArr.putStorage( wdata_p, deleteWgtG ) ;
   Array<Float> gdataArr = real( gdataArrC ) ;
+  t0 = mathutil::gettimeofday_sec() ;
   data_.resize( gdataArr.shape() ) ;
   data_ = 0.0 ;
@@ -272 +297 @@
         for ( Int ic = 0 ; ic < nchan_ ; ic++ ) {
           IPosition pos( 4, ix, iy, ip, ic ) ;
-          IPosition gpos( 4, ix+convSupport_, iy+convSupport_, ip, ic ) ;
+          IPosition gpos( 4, ix, iy, ip, ic ) ;
+//           IPosition gpos( 4, ix+convSupport_, iy+convSupport_, ip, ic ) ;
           if ( gwgtArr( gpos ) > 0.0 ) 
             data_( pos ) = gdataArr( gpos ) / gwgtArr( gpos ) ;
@@ -279 +305 @@
     }
   }
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "set data: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
   //Matrix<Double> sumWeight( IPosition( 2, npol_, nchan_ ), sumw_p, TAKE_OVER ) ;
   delete sumw_p ;
   //cout << "sumWeight = " << sumWeight << endl ;
-  //cout << "gdataArr = " << gdataArr << endl ;
-  //cout << "gwgtArr = " << gwgtArr << endl ;
-  //cout << "data_ " << data_ << endl ;
+//   os << "gdataArr = " << gdataArr << LogIO::POST ;
+//   os << "gwgtArr = " << gwgtArr << LogIO::POST ;
+//   os << "data_ " << data_ << LogIO::POST ;
 }
 
@@ -400 +428 @@
        << "IFNO is not given. Using default IFNO: " << ifno << LogIO::POST ;
   }
-  tab = taborg( taborg.col("IFNO") == ifno ) ;
+//   tab = taborg( taborg.col("IFNO") == ifno ) ;
+  TableExprNode node ;
+  node = taborg.col("IFNO") == ifno ;
+  if ( scanlist_.size() > 0 ) {
+    node = node && taborg.col("SCANNO").in( scanlist_ ) ;
+  }
+  tab = taborg( node ) ;
   if ( tab.nrow() == 0 ) {
     LogIO os( LogOrigin("STGrid","getData",WHERE) ) ;
     os << LogIO::SEVERE
-       << "No corresponding rows for given IFNO: " << ifno 
+       << "No corresponding rows for given selection: IFNO" << ifno 
+       << "SCANNO " << scanlist_ 
        << LogIO::EXCEPTION ;
   }
@@ -575 +610 @@
   // grid plane to avoid unexpected behavior on grid edge
   Vector<Double> pixc( 2 ) ;
-  //pixc(0) = Double( nx_-1 ) * 0.5 ;
-  //pixc(1) = Double( ny_-1 ) * 0.5 ;
-  pixc(0) = Double( nx_+2*convSupport_-1 ) * 0.5 ;
-  pixc(1) = Double( ny_+2*convSupport_-1 ) * 0.5 ;
+  pixc(0) = Double( nx_-1 ) * 0.5 ;
+  pixc(1) = Double( ny_-1 ) * 0.5 ;
+//   pixc(0) = Double( nx_+2*convSupport_-1 ) * 0.5 ;
+//   pixc(1) = Double( ny_+2*convSupport_-1 ) * 0.5 ;
   uInt nrow = world.shape()[1] ;
   Vector<Double> cell( 2 ) ;
   cell(0) = cellx_ ;
   cell(1) = celly_ ;
-  //ofstream ofs( "grid.dat", ios::out ) ; 
   for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
-    //ofs << irow ;
     for ( uInt i = 0 ; i < 2 ; i++ ) {
       pixel( i, irow ) = pixc(i) + ( world(i, irow) - center_(i) ) / cell(i) ;
-      //ofs << " " << world(i, irow) << " " << pixel(i, irow) ;
-    }
-    //ofs << endl ;
-  }
-  //ofs.close() ;
+    }
+  }
+//   String gridfile = "grid."+convType_+"."+String::toString(convSupport_)+".dat" ; 
+//   ofstream ofs( gridfile.c_str(), ios::out ) ; 
+//   ofs << "center " << center_(0) << " " << pixc(0) 
+//       << " " << center_(1) << " " << pixc(1) << endl ;
+//   for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
+//     ofs << irow ;
+//     for ( uInt i = 0 ; i < 2 ; i++ ) {
+//       ofs << " " << world(i, irow) << " " << pixel(i, irow) ;
+//     }
+//     ofs << endl ;
+//   }
+//   ofs.close() ;
 }
 

trunk/src/STGrid.h

@@ -53 +53 @@
   void setPolList( vector<unsigned int> pols ) ;
 
+  void setScanList( vector<unsigned int> scans ) ;
+
   void defineImage( int nx=-1,
                     int ny=-1,
@@ -58 +60 @@
                     string scelly="",
                     string scenter="" ) ;
-  void setOption( string convtype="box",
-                  int convsupport=-1 ) ;
+  void setFunc( string convtype="box",
+                int convsupport=-1 ) ;
 
   void setWeight( const string wType="uniform" ) ;
@@ -118 +120 @@
   Array<Float> data_ ;
   Vector<uInt> pollist_ ;
+  Vector<uInt> scanlist_ ;
   String wtype_ ;
 

trunk/src/python_STGrid.cpp

@@ -23 +23 @@
     .def("_setif", &STGrid::setIF)
     .def("_setpollist", &STGrid::setPolList)
+    .def("_setscanlist", &STGrid::setScanList)
     .def("_defineimage", &STGrid::defineImage)
-    .def("_setoption", &STGrid::setOption)
+    .def("_setfunc", &STGrid::setFunc)
     .def("_grid", &STGrid::grid)
     .def("_setin", &STGrid::setFileIn)