Changeset 1941 for trunk

Timestamp:

10/01/10 12:44:57 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: Yes/No

JIRA Issue: No/Yes List JIRA ticket.

Ready for Test: Yes/No

Interface Changes: Yes/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 PKSMS2writer (external-alma@asap4casa3.1.0) to trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/PKSIO/PKSMS2writer.cc (modified) (6 diffs)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

trunk/external-alma/atnf/PKSIO/PKSMS2writer.cc

@@ -732 +732 @@
   // Extend the DATA_DESCRIPTION subtable.
   while (Int(cDataDescription.nrow()) < IFno) {
-    cDataDescription.addRow();
+    cDataDescription.addRow(1,True);
   }
   Int n = IFno - 1;
@@ -966 +966 @@
 {
   // Extend the POLARIZATION subtable.
+  Int nr = cPolarization.nrow() ;
   while (Int(cPolarization.nrow()) < IFno) {
-    cPolarization.addRow();
+    cPolarization.addRow(1,True);
   }
   Int n = IFno - 1;
@@ -985 +986 @@
   corrType(1) = Stokes::YY;
   }
+  // initialization
+  for ( Int i = nr ; i < n ; i++ )
+    cPolarizationCols->corrType().put( i, corrType ) ;
   cPolarizationCols->corrType().put(n, corrType);
 
@@ -1092 +1096 @@
 {
   // Extend the SPECTRAL_WINDOW subtable.
+  Int nr = cSpectralWindow.nrow() ;
   while (Int(cSpectralWindow.nrow()) < IFno) {
-    cSpectralWindow.addRow();
+    cSpectralWindow.addRow(1,True);
   }
   Int n = IFno - 1;
@@ -1111 +1116 @@
     freqs(i) = refFreq + (i - refChan)*freqInc;
   }
+  // initialization
+  for ( Int i = nr ; i < n ; i++ ) 
+    cSpWindowCols->chanFreq().put( i, freqs ) ;
   cSpWindowCols->chanFreq().put(n, freqs);
 
   Vector<Double> chanWidths(nChan, freqInc);
+  // initialization
+  for ( Int i = nr ; i < n ; i++ ) {
+    cSpWindowCols->chanWidth().put( i, chanWidths ) ;
+    cSpWindowCols->effectiveBW().put( i, chanWidths ) ;
+  }
   cSpWindowCols->chanWidth().put(n, chanWidths);
 
@@ -1120 +1133 @@
 
   Vector<Double> resolution(nChan, fabs(freqInc));
+  // initialization
+  for ( Int i = nr ; i < n ; i++ ) 
+    cSpWindowCols->resolution().put( i, resolution ) ;
   cSpWindowCols->resolution().put(n, resolution);