Changeset 2050 for branches

Timestamp:

03/15/11 23:55:13 (13 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...

Merge from trunk (r2049).

Commented out debug messages.

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

@@ -1036 +1036 @@
   String sep = "" ;
   String tmpStr = obsMode.substr( 0, obsMode.find_first_of( "," ) ) ;
-  os_ << "tmpStr = " << tmpStr << LogIO::POST ;
+  //os_ << "tmpStr = " << tmpStr << LogIO::POST ;
   //if ( obsMode.find( ":" ) != String::npos ) {
   if ( tmpStr.find( ":" ) != String::npos ) {
@@ -1049 +1049 @@
     sep = "_" ;
   }
-  os_ << "separator = " << sep << LogIO::POST ;
+  //os_ << "separator = " << sep << LogIO::POST ;
 
   // determine SRCTYPE