Changeset 2250 for trunk/external-alma

Timestamp:

07/27/11 17:16:18 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

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

Updated getSrcType sucha that the code is able to handle scan intent of
calibration scans correctly.

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (1 diff)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -924 +924 @@
       else if ( subIntent == OFF_SOURCE ) {
         srctype = SrcType::REF ;
+      }
+    }
+  }
+  else if ( scanIntent == CALIBRATE_ATMOSPHERE ) {
+    if ( swmode == NO_SWITCHING || swmode == POSITION_SWITCHING ) {
+      // position switching
+      // tentatively set NO_SWITCHING = POSITION_SWITCHING
+      if ( subIntent == ON_SOURCE ) {
+        srctype = SrcType::PONCAL ;
+      }
+      else if ( subIntent == OFF_SOURCE ) {
+        srctype = SrcType::POFFCAL ;
+      }
+    }
+    else if ( swmode == FREQUENCY_SWITCHING ) {
+      // frequency switching
+      if ( subIntent == ON_SOURCE ) {
+        srctype = SrcType::FONCAL ;
+      }
+      else if ( subIntent == OFF_SOURCE ) {
+        srctype = SrcType::FOFFCAL ;
+      }
+    }
+    else if ( swmode == NUTATOR_SWITCHING ) {
+      // nutator switching
+      if ( subIntent == ON_SOURCE ) {
+        srctype = SrcType::PONCAL ;
+      }
+      else if ( subIntent == OFF_SOURCE ) {
+        srctype = SrcType::POFFCAL ;
+      }
+    }
+    else {
+      // other switching mode
+      if ( subIntent == ON_SOURCE ) {
+        srctype = SrcType::CAL ;
+      }
+      else if ( subIntent == OFF_SOURCE ) {
+        srctype = SrcType::CAL ;
       }
     }