Changeset 2020 for trunk/src

Timestamp:

03/01/11 18:43:34 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

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...

Bug fix on FEED subtable.

File:

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

trunk/src/MSWriter.cpp

@@ -164 +164 @@
   RecordFieldPtr<Int> ddidRF( trec, "DATA_DESC_ID" ) ;
   RecordFieldPtr<Int> stateidRF( trec, "STATE_ID" ) ;
-
+  RecordFieldPtr< Array<Bool> > flagcatRF( trec, "FLAG_CATEGORY" ) ;
 
   // OBSERVATION_ID is always 0
@@ -455 +455 @@
               
               // FLAG_CATEGORY is tentatively set
-              RecordFieldPtr< Array<Bool> > flagcatRF( trec, "FLAG_CATEGORY" ) ;
               //*flagcatRF = Cube<Bool>( nrow, nchan, 1, False ) ; 
               flagcatRF.define( Cube<Bool>( nrow, nchan, 1, False ) ) ; 
@@ -1226 +1225 @@
   msFeed.addRow( 1, True ) ;
   Int nrow = msFeed.nrow() ;
+  Int numReceptors = 2 ;
+  Vector<String> polType( numReceptors ) ;
+  Matrix<Double> beamOffset( 2, numReceptors ) ;
+  beamOffset = 0.0 ;
+  Vector<Double> receptorAngle( numReceptors, 0.0 ) ;
+  if ( polType_ == "linear" ) {
+    polType[0] = "X" ;
+    polType[1] = "Y" ;
+  }
+  else if ( polType_ == "circular" ) {
+    polType[0] = "R" ;
+    polType[1] = "L" ;
+  }
+  else {
+    polType[0] = "X" ;
+    polType[1] = "Y" ;
+  }
+  Matrix<Complex> polResponse( numReceptors, numReceptors, 0.0 ) ;
+  for ( Int i = 0 ; i < numReceptors ; i++ )
+    polResponse( i, i ) = 0.0 ;
 
   MSFeedColumns msFeedCols( mstable_->feed() ) ;
@@ -1231 +1250 @@
   msFeedCols.feedId().put( nrow-1, id ) ;
   msFeedCols.antennaId().put( nrow-1, 0 ) ;
+  msFeedCols.numReceptors().put( nrow-1, numReceptors ) ;
+  msFeedCols.polarizationType().put( nrow-1, polType ) ;
+  msFeedCols.beamOffset().put( nrow-1, beamOffset ) ;
+  msFeedCols.receptorAngle().put( nrow-1, receptorAngle ) ;
+  msFeedCols.polResponse().put( nrow-1, polResponse ) ;
 
   double endSec = gettimeofday_sec() ;
@@ -1688 +1712 @@
   // MS: "s"
   me = midTime ;
-  interval = ( maxTime - minTime ) * 86400.0 ;
+  interval = ( maxTime - minTime ) * 86400.0 + mean( ainterval ) ;
 
   double endSec = gettimeofday_sec() ;