Changeset 2741

Timestamp:

01/21/13 19:41:11 (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:

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on handling IFNO and FREQ_ID when exporting scantable to MS.

File:

• trunk/src/MSWriter.cpp (modified) (5 diffs)

trunk/src/MSWriter.cpp

@@ -12 +12 @@
 //
 #include <assert.h>
+
+#include <set>
 
 #include <casa/OS/File.h>
@@ -1048 +1050 @@
   void addSpectralWindow( Int sid, uInt fid )
   {
-    if ( !processedFreqId[fid] ) {
+    if (processedFreqId.find((uInt)fid) == processedFreqId.end() 
+        || processedIFNO.find((uInt)sid) == processedIFNO.end() ) {
       uInt nrow = spwtab.nrow() ;
       while( (Int)nrow <= sid ) {
@@ -1054 +1057 @@
         nrow++ ;
       }
-      processedFreqId[fid] = True ;
+      processedFreqId.insert((uInt)fid);
+      processedIFNO.insert((uInt)sid);
     }
     else {
       return ;
     }
+      
 
     Double rp = refpix[fid] ;
@@ -1169 +1174 @@
     Vector<Double> ic = iccol.getColumn() ;
     for ( uInt i = 0 ; i < id.nelements() ; i++ ) {
-      processedFreqId.insert( pair<uInt,Bool>( id[i], False ) ) ;
       refpix.insert( pair<uInt,Double>( id[i], rp[i] ) ) ;
       refval.insert( pair<uInt,Double>( id[i], rv[i] ) ) ;
@@ -1462 +1466 @@
   Block<Int> feedEntry;
   vector< Vector<Int> > polEntry;
-  map<uInt,Bool> processedFreqId;
+  set<uInt> processedFreqId;
+  set<uInt> processedIFNO;
   map<uInt,Double> refpix;
   map<uInt,Double> refval;