Changeset 2618 for trunk

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:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (2 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -935 +935 @@
   ScanIntentMod::ScanIntent scanIntent = scanrow->getScanIntent()[0] ;
   SubscanRow *subrow = asdm_->getSubscan().getRowByKey( execBlockTag_, (int)scan, (int)subscan ) ;
+  if ( subrow == 0 ) {
+    return srctype ;
+  }
   SubscanIntentMod::SubscanIntent subIntent = subrow->getSubscanIntent() ;
   SwitchingModeMod::SwitchingMode swmode = SwitchingModeMod::NO_SWITCHING ;
@@ -1048 +1051 @@
 unsigned int ASDMReader::getSubscanNo() 
 {
-  //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)) ) ;
-  return vmsData_->v_msState[dataIndex_].subscanNum ;
+  return mainRow_[row_]->getSubscanNumber() ;
 }