Changeset 2299

Timestamp:

09/14/11 18:49:24 (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...

Do not access Subscan/SubscanMode? if it doesn't exist.

Location:

trunk/external-alma

Files:

• asdm2ASAP/ASDMReader.cc (modified) (2 diffs)
• oldasdm2ASAP/OldASDMReader.cc (modified) (1 diff)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -167 +167 @@
   asdm_ = new ASDM() ;
   // avoid unwanted message to stdout
-  ostringstream oss ;
-  streambuf *buforg = cout.rdbuf(oss.rdbuf()) ;
+  //ostringstream oss ;
+  //streambuf *buforg = cout.rdbuf(oss.rdbuf()) ;
   asdm_->setFromFile( filename ) ;
-  cout.rdbuf(buforg) ;
+  //cout.rdbuf(buforg) ;
 
   if ( antennaId_ == -1 ) {
@@ -891 +891 @@
   SubscanRow *subrow = asdm_->getSubscan().getRowByKey( ebtag, (int)scan, (int)subscan ) ;
   SubscanIntent subIntent = subrow->getSubscanIntent() ;
-  SwitchingMode swmode = subrow->getSubscanMode() ;
+  SwitchingMode swmode = NO_SWITCHING ;
+  if ( subrow->isSubscanModeExists() )
+    swmode = subrow->getSubscanMode() ;
   if ( scanIntent == OBSERVE_TARGET ) {
     // on sky scan

trunk/external-alma/oldasdm2ASAP/OldASDMReader.cc

@@ -887 +887 @@
   SubscanRow *subrow = asdm_->getSubscan().getRowByKey( ebtag, (int)scan, (int)subscan ) ;
   SubscanIntent subIntent = subrow->getSubscanIntent() ;
-  SwitchingMode swmode = subrow->getSubscanMode() ;
+  SwitchingMode swmode = NO_SWITCHING ;
+  if ( subrow->isSubscanModeExists() )
+    swmode = subrow->getSubscanMode() ;
   if ( scanIntent == OBSERVE_TARGET ) {
     // on sky scan