Changeset 3061 for trunk

Timestamp:

11/18/15 19:56:31 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-8097

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

More strict intent mapping. Only CALIBRATE_ATMOSPHERE#* intents are mapped into Srctype::PONCAL or SrcType::POFFCAL. Other CALIBRATE_* intents such as POINTING are separated from ATMOSPHERE and mapped into SrcType::CAL.

File:

• trunk/src/MSFiller.cpp (modified) (1 diff)

trunk/src/MSFiller.cpp

@@ -1075 +1075 @@
     String m1 = first.substr( 0, epos ) ;
     String m2 = first.substr( epos+1, nextpos-epos-1 ) ;
-    if ( m1.find( "CALIBRATE_" ) == 0 ) {
+    if ( m1.find( "CALIBRATE_ATMOSPHERE" ) == 0 ) {
       if (m2.find( "ON_SOURCE" ) == 0 || m2.find("HOT") == 0 || m2.find("AMBIENT") == 0)
         st = SrcType::PONCAL ;
       else if ( m2.find( "OFF_SOURCE" ) == 0 )
         st = SrcType::POFFCAL ;
+    }
+    else if ( m1.find( "CALIBRATE_" ) == 0 ) {
+      st = SrcType::CAL ;
     }
     else if ( m1.find( "OBSERVE_TARGET" ) == 0 ) {