Changeset 2019 for trunk/src/MSFiller.cpp

Timestamp:

03/01/11 17:13:36 (13 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...

Bug fix

1) supporting variable shaped array input to some column (SPECTRAL DATA, TSYS, and TCAL)

2) put [1.0] instead of empty array as default TCAL in NROFiller

3) Check if some subtables have any effective rows in MSWriter

File:

• trunk/src/MSFiller.cpp (modified) (4 diffs)

trunk/src/MSFiller.cpp

@@ -849 +849 @@
                   *polnoRF = polnos[ipol] ;
 
-                  *spRF = sp.row( ipol ) ;
-                  *ucarrRF = fl.row( ipol ) ;
-                  *tsysRF = tsys.row( ipol ) ;
+                  //*spRF = sp.row( ipol ) ;
+                  //*ucarrRF = fl.row( ipol ) ;
+                  //*tsysRF = tsys.row( ipol ) ;
+                  spRF.define( sp.row( ipol ) ) ;
+                  ucarrRF.define( fl.row( ipol ) ) ;
+                  tsysRF.define( tsys.row( ipol ) ) ;
                   *tcalidRF = tcalids[ipol] ;
 
@@ -1288 +1291 @@
         for ( uInt ipol = 0 ; ipol < npol ; ipol++ ) {
           *idRF = idx++ ;
-          *tcalRF = subtcal.row( ipol ) ;
+          //*tcalRF = subtcal.row( ipol ) ;
+          tcalRF.define( subtcal.row( ipol ) ) ;
 
           // commit row
@@ -1319 +1323 @@
 //   os_ << "start MSFiller::getWeatherId() startSec=" << startSec << LogIO::POST ;
   uInt nrow = mwTime_.size() ;
-  if ( nrow == 0 ) 
+  if ( nrow < 2 ) 
     return 0 ;
   uInt wid = nrow ;
@@ -1362 +1366 @@
   if ( scTime.nelements() == 0 ) 
     return ;
+  else if ( scTime.nelements() == 1 ) {
+    tidx[0] = 0 ;
+    return ;
+  }
   uInt scnrow = scTime.nelements() ;
   uInt idx = 0 ;