Changeset 2028 for trunk/src

Timestamp:

03/02/11 18:32:41 (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...

Bug fix on getSrcType() that takes place if ALMA data.

File:

• trunk/src/MSFiller.cpp (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -1020 +1020 @@
     sep = "." ;
   }
-  
+
   // determine SRCTYPE
   Int srcType = SrcType::NOTYPE ;
@@ -1081 +1081 @@
     //    obsMode2=ON_SOURCE: PON
     //    obsMode2=OFF_SOURCE: POFF
-    Int epos = obsMode.find_first_of( sep ) ;
-    Int nextpos = obsMode.find_first_of( sep, epos+1 ) ;
-    String obsMode1 = obsMode.substr( 0, epos ) ;
-    String obsMode2 = obsMode.substr( epos+1, nextpos-epos-1 ) ;
+    string substr[2] ; 
+    int numSubstr = split( obsMode, substr, 2, "," ) ;
+    //os_ << "numSubstr = " << numSubstr << LogIO::POST ;
+    //for ( int i = 0 ; i < numSubstr ; i++ )
+    //os_ << "substr[" << i << "] = " << substr[i] << LogIO::POST ;
+    String obsType( substr[0] ) ;
+    //os_ << "obsType = " << obsType << LogIO::POST ;
+    Int epos = obsType.find_first_of( sep ) ;
+    Int nextpos = obsType.find_first_of( sep, epos+1 ) ;
+    String obsMode1 = obsType.substr( 0, epos ) ;
+    String obsMode2 = obsType.substr( epos+1, nextpos-epos-1 ) ;
     if ( obsMode1.find( "CALIBRATE_" ) == 0 ) {
       if ( obsMode2 == "ON_SOURCE" ) srcType = SrcType::PONCAL ;