Changeset 2105 for branches/casa-prerelease/pre-asap/src

Timestamp:

04/05/11 18:09:59 (13 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...

Merged bug fix on trunk (r2103).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/MSWriter.cpp (modified) (2 diffs)
• src/MSWriter.h (modified) (1 diff)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/src/MSWriter.cpp

@@ -444 +444 @@
     fillSysCal() ;
 
+  // fill empty SPECTRAL_WINDOW rows
+  infillSpectralWindow() ;
+
   // ASDM tables 
   const TableRecord &stKeys = table_->table().keywordSet() ;
@@ -1896 +1899 @@
   return diameter ;
 }
-}
+
+void MSWriter::infillSpectralWindow()
+{
+  MSSpectralWindow msSpw = mstable_->spectralWindow() ;
+  MSSpWindowColumns msSpwCols( msSpw ) ;
+  uInt nrow = msSpw.nrow() ;
+
+  ScalarColumn<Int> measFreqRefCol = msSpwCols.measFreqRef() ;
+  ArrayColumn<Double> chanFreqCol = msSpwCols.chanFreq() ;
+  ArrayColumn<Double> chanWidthCol = msSpwCols.chanWidth() ;
+  ArrayColumn<Double> effectiveBWCol = msSpwCols.effectiveBW() ;
+  ArrayColumn<Double> resolutionCol = msSpwCols.resolution() ;
+  Vector<Double> dummy( 1, 0.0 ) ;
+  for ( uInt irow = 0 ; irow < nrow ; irow++ ) {
+    if ( !(chanFreqCol.isDefined( irow )) ) {
+      measFreqRefCol.put( irow, 1 ) ;
+      chanFreqCol.put( irow, dummy ) ;
+      chanWidthCol.put( irow, dummy ) ;
+      effectiveBWCol.put( irow, dummy ) ;
+      resolutionCol.put( irow, dummy ) ;
+    }
+  }
+
+}
+
+}

branches/casa-prerelease/pre-asap/src/MSWriter.h

@@ -67 +67 @@
   void fillSysCal() ;
 
+  // fill empty rows
+  void infillSpectralWindow() ;
+
   // add rows to subtables
   void addFeed( casa::Int id ) ;