Changeset 2079 for branches

Timestamp:

03/25/11 18:54:13 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

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

Merged bug fix on MSFiller in trunk (r2078).

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

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

@@ -430 +430 @@
           Int spwId = tcolr->asInt( ddId ) ;
           tpoolr->destroy( tcolr ) ;
-          // TODO: This must be updated if writer will be replaced from STWriter to MSWriter
-          sdh.nif = max( sdh.nif, spwId ) ;
 
           // IFNO
@@ -934 +932 @@
 
   // Table Keywords
-  // TODO: This must be updated if writer will be replaced from STWriter to MSWriter
-//   sdh.nif = ifmap.size() ;
-  sdh.nif++ ;
+  sdh.nif = ifmap.size() ;
   if ( ( telescopeName == "" ) || ( antennaName == telescopeName ) ) {
     sdh.antennaname = antennaName ;