Changeset 2338 for branches

Timestamp:

10/18/11 03:40:23 (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 in trunk (r2337).

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) (2 diffs)
• src/SConscript (modified) (1 prop)

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

@@ -2376 +2376 @@
   RecordFieldPtr<String> nameRF( r, "NAME" ) ;
   RecordFieldPtr<String> stationRF( r, "STATION" ) ;
-  RecordFieldPtr<String> mountRF( r, "NAME" ) ;
+  RecordFieldPtr<String> mountRF( r, "MOUNT" ) ;
   RecordFieldPtr<String> typeRF( r, "TYPE" ) ;
   RecordFieldPtr<Double> dishDiameterRF( r, "DISH_DIAMETER" ) ;
@@ -2385 +2385 @@
   *dishDiameterRF = diameter ;
   *positionRF = antpos ;
+  *stationRF = stationName ;
   
   tr.put( 0 ) ;