Changeset 2746 for trunk

Timestamp:

01/23/13 19:09:27 (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: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed a known bug that SYSCAL table is not properly handled when
import/export.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (2 diffs)
• MSWriter.cpp (modified) (3 diffs)

trunk/src/MSFiller.cpp

@@ -581 +581 @@
       tcalids = getTcalId( syscalTime[scIdx] ) ;
     }
-//     else {
-//       tcalids = getDummyTcalId( spwId ) ;
-//     }
+    else {
+      tcalids = getDummyTcalId( spwId ) ;
+    }
 
     // put value
@@ -1265 +1265 @@
         idList[j] = tmp[0];
       }
-      cout << "tmp=" << tmp << endl;
     }
     return idList;

trunk/src/MSWriter.cpp

@@ -1686 +1686 @@
 public:
   BaseTcalProcessor( ROArrayColumn<Float> &tcalCol )
-    : col( tcalCol )
+    : col_( tcalCol )
   {}
   virtual ~BaseTcalProcessor() {}
-  void setTcalId( Vector<uInt> &tcalId ) { id.assign( tcalId ) ; } 
+  void setTcalId( Vector<uInt> &tcalId ) { id_.assign( tcalId ) ; } 
   virtual Array<Float> getTcal() = 0 ;
 protected:
-  ROArrayColumn<Float> col ;
-  Vector<uInt> id ;
+  ROArrayColumn<Float> col_ ;
+  Vector<uInt> id_ ;
 };
 
@@ -1705 +1705 @@
   virtual Array<Float> getTcal()
   {
-    uInt npol = id.nelements() ;
+    uInt npol = id_.nelements() ;
     Vector<Float> tcal( npol ) ;
     for ( uInt ipol = 0 ; ipol < npol ; ipol++ )
-      tcal[ipol] = col( id[ipol] ).data()[0] ;
+      tcal[ipol] = col_( id_[ipol] ).data()[0] ;
     //cout << "TcalProcessor: tcal = " << tcal << endl ;
     return tcal ;
@@ -1723 +1723 @@
   virtual Array<Float> getTcal()
   {
-    uInt npol = id.nelements() ;
-    Vector<Float> tcal0 = col( 0 ) ;
+    uInt npol = id_.nelements() ;
+    //Vector<Float> tcal0 = col_( 0 ) ;
+    Vector<Float> tcal0 = col_( id_[0] ) ;
     uInt nchan = tcal0.nelements() ;
     Matrix<Float> tcal( npol, nchan ) ;
     tcal.row( 0 ) = tcal0 ;
     for ( uInt ipol = 1 ; ipol < npol ; ipol++ ) 
-      tcal.row( ipol ) = col( id[ipol] ) ;
+      tcal.row( ipol ) = col_( id_[ipol] ) ;
     return tcal ;
   }