Changeset 2039 for trunk/src

Timestamp:

03/14/11 20:51:04 (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...

Modification according to the change of OBS_MODE string created by
importasdm task.

File:

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

trunk/src/MSFiller.cpp

@@ -1035 +1035 @@
   // determine separator
   String sep = "" ;
-  if ( obsMode.find( ":" ) != String::npos ) {
+  String tmpStr = obsMode.substr( 0, obsMode.find_first_of( "," ) ) ;
+  os_ << "tmpStr = " << tmpStr << LogIO::POST ;
+  //if ( obsMode.find( ":" ) != String::npos ) {
+  if ( tmpStr.find( ":" ) != String::npos ) {
     sep = ":" ;
   }
-  else if ( obsMode.find( "." ) != String::npos ) {
+  //else if ( obsMode.find( "." ) != String::npos ) {
+  else if ( tmpStr.find( "." ) != String::npos ) {
     sep = "." ;
   }
+  //else if ( obsMode.find( "_" ) != String::npos ) {
+  else if ( tmpStr.find( "_" ) != String::npos ) {
+    sep = "_" ;
+  }
+  os_ << "separator = " << sep << LogIO::POST ;
 
   // determine SRCTYPE
@@ -1094 +1103 @@
     // sep == "."
     //
-    // ALMA & EVLA case (MS via ASDM)
+    // ALMA & EVLA case (MS via ASDM) before3.1
     //
     // obsMode1=CALIBRATE_*
@@ -1122 +1131 @@
       if ( obsMode2 == "ON_SOURCE" ) srcType = SrcType::PSON ;
       if ( obsMode2 == "OFF_SOURCE" ) srcType = SrcType::PSOFF ;
+    }
+  }
+  else if ( sep == "_" ) {
+    // sep == "_"
+    //
+    // ALMA & EVLA case (MS via ASDM) after 3.2
+    //
+    // obsMode1=CALIBRATE_*
+    //    obsMode2=ON_SOURCE: PONCAL
+    //    obsMode2=OFF_SOURCE: POFFCAL
+    // obsMode1=OBSERVE_TARGET
+    //    obsMode2=ON_SOURCE: PON
+    //    obsMode2=OFF_SOURCE: POFF
+    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 ;
+    string substr2[4] ;
+    int numSubstr2 = split( obsType, substr2, 4, sep ) ; 
+    //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 ) ;
+    String obsMode1( substr2[0] ) ;
+    String obsMode2( substr2[2] ) ;
+    //os_ << "obsMode1 = " << obsMode1 << LogIO::POST ;
+    //os_ << "obsMode2 = " << obsMode2 << LogIO::POST ;
+    if ( obsMode1.find( "CALIBRATE" ) == 0 ) {
+      if ( obsMode2 == "ON" ) srcType = SrcType::PONCAL ;
+      if ( obsMode2 == "OFF" ) srcType = SrcType::POFFCAL ;
+    }
+    else if ( obsMode1 == "OBSERVE" ) {
+      if ( obsMode2 == "ON" ) srcType = SrcType::PSON ;
+      if ( obsMode2 == "OFF" ) srcType = SrcType::PSOFF ;
     }
   }