Changeset 2362 for trunk/src

Timestamp:

12/07/11 15:53:03 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: No

Interface Changes: Yes

What Interface Changed: Added method to specify IFNO to be processed

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Added method to specify IFNO to be processed.

Location:

trunk/src

Files:

• STGrid.cpp (modified) (8 diffs)
• STGrid.h (modified) (4 diffs)
• python_STGrid.cpp (modified) (1 diff)

trunk/src/STGrid.cpp

@@ -45 +45 @@
 void  STGrid::init() 
 {
+  ifno_ = -1 ;
   nx_ = -1 ;
   ny_ = -1 ;
@@ -50 +51 @@
   nchan_ = 0 ;
   nrow_ = 0 ;
-  ngrid_ = 0 ;
   cellx_ = 0.0 ;
   celly_ = 0.0 ;
@@ -154 +154 @@
   Matrix<uInt> rflag ;
   Matrix<Float> weight ;
-  getData( infile_, spectra, direction, flagtra, rflag, weight ) ;
+  getData( spectra, direction, flagtra, rflag, weight ) ;
   IPosition sshape = spectra.shape() ;
   //os << "spectra.shape()=" << spectra.shape() << LogIO::POST ;
@@ -168 +168 @@
   
   // grid parameter
-//   os << "----------" << endl ;
-//   os << "Grid parameter summary" << endl ;
-//   os << "   (nx,ny) = (" << nx_ << "," << ny_ << ")" << endl ;
-//   os << "   (cellx,celly) = (" << cellx_ << "," << celly_ << ")" << endl ;
-//   os << "   center = " << center_ << endl ;
-//   os << "----------" << LogIO::POST ;
+  os << LogIO::DEBUGGING ;
+  os << "----------" << endl ;
+  os << "Grid parameter summary" << endl ;
+  os << "   (nx,ny) = (" << nx_ << "," << ny_ << ")" << endl ;
+  os << "   (cellx,celly) = (" << cellx_ << "," << celly_ << ")" << endl ;
+  os << "   center = " << center_ << endl ;
+  os << "----------" << LogIO::POST ;
+  os << LogIO::NORMAL ;
 
   // convolution kernel
@@ -384 +386 @@
 }
 
-void STGrid::getData( String &infile, 
-                      Cube<Float> &spectra,
+void STGrid::selectData( Table &tab )
+{
+  Int ifno = ifno_ ;
+  Table taborg( infile_ ) ;
+  if ( ifno == -1 ) {
+    LogIO os( LogOrigin("STGrid","getData",WHERE) ) ;
+//     os << LogIO::SEVERE
+//        << "Please set IFNO before actual gridding" 
+//        << LogIO::EXCEPTION ;
+    ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
+    ifno = ifnoCol( 0 ) ;
+    os << LogIO::WARN
+       << "IFNO is not given. Using default IFNO: " << ifno << LogIO::POST ;
+  }
+  tab = taborg( taborg.col("IFNO") == ifno ) ;
+  if ( tab.nrow() == 0 ) {
+    LogIO os( LogOrigin("STGrid","getData",WHERE) ) ;
+    os << LogIO::SEVERE
+       << "No corresponding rows for given IFNO: " << ifno 
+       << LogIO::EXCEPTION ;
+  }
+}
+
+void STGrid::getData( Cube<Float> &spectra,
                       Matrix<Double> &direction,
                       Cube<uChar> &flagtra,
@@ -391 +415 @@
                       Matrix<Float> &weight ) 
 {
-  Table tab( infile ) ;
-  //uInt npol = tab.keywordSet().asuInt( "nPol" ) ;
+  Table tab ;
+  selectData( tab ) ;
   ROScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
-  //uInt npol = max( polnoCol.getColumn() ) + 1 ;
   Vector<uInt> pols = polnoCol.getColumn() ;
   Vector<uInt> pollistOrg ;
@@ -509 +532 @@
   if ( npol_ > 1 ) {
     LogIO os( LogOrigin("STGrid", "getWeight", WHERE) ) ;
-    os << LogIO::WARN << "STGrid doesn't support assigning independent polarization-dependent weight. Use averaged weight over polarization." << LogIO::POST ;
+    os << LogIO::WARN << "STGrid doesn't support assigning polarization-dependent weight. Use averaged weight over polarization." << LogIO::POST ;
   }
 }
@@ -667 +690 @@
   Table tab = out->table() ;
   IPosition dshape = data_.shape() ;
-  //Int npol = dshape[2] ;
-  //Int nchan = dshape[3] ;
   Int nrow = nx_ * ny_ * npol_ ;
   tab.rwKeywordSet().define( "nPol", npol_ ) ;

trunk/src/STGrid.h

@@ -49 +49 @@
   void setFileIn( const string infile ) ;
 
+  void setIF( unsigned int ifno ) { ifno_ = ifno ; } ;
+
   void setPolList( vector<unsigned int> pols ) ;
 
@@ -78 +80 @@
                   String &center ) ;
   
-  void getData( String &infile, 
-                Cube<Float> &spectra,
+  void getData( Cube<Float> &spectra,
                 Matrix<Double> &direction,
                 Cube<uChar> &flagtra,
@@ -99 +100 @@
   void pbFunc( Vector<Float> &convFunc ) ;
   void setConvFunc( Vector<Float> &convFunc ) ;
+  void selectData( Table &tab ) ;
 
   String infile_ ;
+  Int ifno_ ;
   Int nx_ ;
   Int ny_ ;
@@ -106 +109 @@
   Int nchan_ ;
   Int nrow_ ;
-  Int ngrid_ ;
   Double cellx_ ;
   Double celly_ ;

trunk/src/python_STGrid.cpp

@@ -21 +21 @@
     .def( init <> () )
     .def( init < const std::string > () )
+    .def("_setif", &STGrid::setIF)
     .def("_setpollist", &STGrid::setPolList)
     .def("_defineimage", &STGrid::defineImage)