Changeset 2618 for trunk


Ignore:
Timestamp:
08/02/12 11:06:41 (12 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: test_importasdm_sd

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for failure of test_importasdm_sd


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/external-alma/asdm2ASAP/ASDMReader.cc

    r2471 r2618  
    935935  ScanIntentMod::ScanIntent scanIntent = scanrow->getScanIntent()[0] ;
    936936  SubscanRow *subrow = asdm_->getSubscan().getRowByKey( execBlockTag_, (int)scan, (int)subscan ) ;
     937  if ( subrow == 0 ) {
     938    return srctype ;
     939  }
    937940  SubscanIntentMod::SubscanIntent subIntent = subrow->getSubscanIntent() ;
    938941  SwitchingModeMod::SwitchingMode swmode = SwitchingModeMod::NO_SWITCHING ;
     
    10481051unsigned int ASDMReader::getSubscanNo()
    10491052{
    1050   //logsink_->postLocally( LogMessage("subscan"+String::toString(vmsData_->v_msState[dataIdList_[idx]].subscanNum)+": obsmode="+String::toString(vmsData_->v_msState[dataIdList_[idx]].obsMode),LogOrigin(className_,funcName,WHERE)) ) ;
    1051   return vmsData_->v_msState[dataIndex_].subscanNum ;
     1053  return mainRow_[row_]->getSubscanNumber() ;
    10521054}
    10531055
Note: See TracChangeset for help on using the changeset viewer.