Changeset 2185 for trunk

Timestamp:

06/07/11 14:33:47 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes ASAP Trac #242

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

Fixed two issues in MSFiller/Writer:

• flux unit wasn't correctly handled in MSWriter
• fixed wrong antenna name when telescope name and station name are not available or equivalent with antenna name

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (1 diff)
• MSWriter.cpp (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -949 +949 @@
     sdh.antennaname = telescopeName + "//" + antennaName ;
   }
-  if ( stationName != "" ) {
+  if ( stationName != "" && stationName != antennaName ) {
     sdh.antennaname += "@" + stationName ;
   }

trunk/src/MSWriter.cpp

@@ -583 +583 @@
 //   double startSec = gettimeofday_sec() ;
 //   os_ << "start MSWriter::setupMS() startSec=" << startSec << LogIO::POST ;
+  
+  String dunit = table_->getHeader().fluxunit ;
 
   TableDesc msDesc = MeasurementSet::requiredTableDesc() ;
@@ -593 +595 @@
 
   mstable_ = new MeasurementSet( newtab ) ;
+
+  TableColumn col ;
+  if ( useFloatData_ )
+    col.attach( *mstable_, "FLOAT_DATA" ) ;
+  else if ( useData_ )
+    col.attach( *mstable_, "DATA" ) ;
+  col.rwKeywordSet().define( "UNIT", dunit ) ;
 
   // create subtables