Changeset 2319

Timestamp:

09/30/11 11:04:31 (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...

Merge bug fix on trunk (r2318).

Location:

branches/casa-prerelease/pre-asap

Files:

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

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

@@ -422 +422 @@
     makePolMap() ;
     initFrequencies() ;
+    initCorrProductTemplate() ;
 
     //
@@ -1194 +1195 @@
     for ( Int i = 0 ; i < n ; i++ )
       c[i] = (Int)polmap[nos[i]] ;
-    cp.resize( 2, n ) ;
-    if ( n == 1 )
-      cp = 0 ;
-    else if ( n == 2 ) {
-      cp.column( 0 ) = 0 ;
-      cp.column( 1 ) = 1 ;
-    }
-    else {
-      cp.column( 0 ) = 0 ;
-      cp.column( 1 ) = 1 ;
-      cp( 0, 1 ) = 0 ;
-      cp( 1, 1 ) = 1 ;
-      cp( 0, 2 ) = 1 ;
-      cp( 1, 2 ) = 0 ;
+    if ( n == 4 && 
+         ( poltype == "linear" || poltype == "circular" ) ) {
+      Int tmp = c[1] ;
+      c[1] = c[2] ;
+      c[2] = c[3] ;
+      c[3] = tmp ;
+    }
+    cp = corrProductTemplate[n] ;
+  }
+  void initCorrProductTemplate()
+  {
+    Int n = 1 ;
+    {
+      Matrix<Int> c( 2, n, 0 ) ;
+      corrProductTemplate[n] = c ;
+    }
+    n = 2 ;
+    { 
+      Matrix<Int> c( 2, n, 0 ) ;
+      c.column( 1 ) = 1 ;
+      corrProductTemplate[n] = c ;
+    }
+    n = 4 ;
+    {
+      Matrix<Int> c( 2, n, 0 ) ;
+      c( 0, 2 ) = 1 ;
+      c( 0, 3 ) = 1 ;
+      c( 1, 1 ) = 1 ;
+      c( 1, 3 ) = 1 ;
+      corrProductTemplate[n] = c ;
     }
   }
@@ -1274 +1291 @@
   MFrequency::Types freqframe;
   Record srcRec;
+  map< Int, Matrix<Int> > corrProductTemplate;
 };