Changeset 2027 for trunk

Timestamp:

03/02/11 18:07: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...

Fixed bugs in POLARIZATION and SPECTRAL_WINDOW subtables.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (1 diff)
• MSWriter.cpp (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -567 +567 @@
           Int refchan = nchan / 2 ;
           IPosition refip( 1, refchan ) ;
-          Double refpix = 0.5*(nchan-1) ;
+          //Double refpix = 0.5*(nchan-1) ;
+          Double refpix = 0.5*(nchan) ;
           Double refval = 0.0 ;
           sharedQDArrCol = new ROArrayQuantColumn<Double>( spwtab, "CHAN_WIDTH" ) ;

trunk/src/MSWriter.cpp

@@ -1252 +1252 @@
   // NUM_CHAN
   Int nchan = (Int)(refpix * 2) ;
+  if ( nchan == 0 )
+    nchan = 1 ;
   msSpwCols.numChan().put( spwid, nchan ) ;
 
@@ -1377 +1379 @@
   uInt nrow = msPol.nrow() ;
 
-  // only 1 POLARIZATION row for 1 scantable
-  if ( nrow > 0 )
-    return 0 ;
+//   // only 1 POLARIZATION row for 1 scantable
+//   if ( nrow > 0 )
+//     return 0 ;
   
   Vector<Int> corrType = toCorrType( polnos ) ;
   
   ROArrayColumn<Int> corrtCol( msPol, "CORR_TYPE" ) ;
-  Matrix<Int> corrTypeArr = corrtCol.getColumn() ;
+  //Matrix<Int> corrTypeArr = corrtCol.getColumn() ;
   Int polid = -1 ;
   for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
-    if ( allEQ( corrType, corrTypeArr.column( irow ) ) ) {
+    Vector<Int> corrTypeArr = corrtCol( irow ) ;
+    if ( corrType.nelements() == corrTypeArr.nelements() 
+         && allEQ( corrType, corrTypeArr ) ) {
       polid = irow ;
       break ;