Changeset 2299 for trunk/external-alma


Ignore:
Timestamp:
09/14/11 18:49:24 (14 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:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/asdm2ASAP/ASDMReader.cc

    r2273 r2299  
    167167  asdm_ = new ASDM() ;
    168168  // avoid unwanted message to stdout
    169   ostringstream oss ;
    170   streambuf *buforg = cout.rdbuf(oss.rdbuf()) ;
     169  //ostringstream oss ;
     170  //streambuf *buforg = cout.rdbuf(oss.rdbuf()) ;
    171171  asdm_->setFromFile( filename ) ;
    172   cout.rdbuf(buforg) ;
     172  //cout.rdbuf(buforg) ;
    173173
    174174  if ( antennaId_ == -1 ) {
    … …  
    891891  SubscanRow *subrow = asdm_->getSubscan().getRowByKey( ebtag, (int)scan, (int)subscan ) ;
    892892  SubscanIntent subIntent = subrow->getSubscanIntent() ;
    893   SwitchingMode swmode = subrow->getSubscanMode() ;
     893  SwitchingMode swmode = NO_SWITCHING ;
     894  if ( subrow->isSubscanModeExists() )
     895    swmode = subrow->getSubscanMode() ;
    894896  if ( scanIntent == OBSERVE_TARGET ) {
    895897    // on sky scan

  • trunk/external-alma/oldasdm2ASAP/OldASDMReader.cc

    r2273 r2299  
    887887  SubscanRow *subrow = asdm_->getSubscan().getRowByKey( ebtag, (int)scan, (int)subscan ) ;
    888888  SubscanIntent subIntent = subrow->getSubscanIntent() ;
    889   SwitchingMode swmode = subrow->getSubscanMode() ;
     889  SwitchingMode swmode = NO_SWITCHING ;
     890  if ( subrow->isSubscanModeExists() )
     891    swmode = subrow->getSubscanMode() ;
    890892  if ( scanIntent == OBSERVE_TARGET ) {
    891893    // on sky scan
Note: See TracChangeset for help on using the changeset viewer.