Changeset 2033 for trunk/src

Timestamp:

03/10/11 03:01:49 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2718

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

Fixed seg fault that happens when no corresponding rows in SOURCE table
for specified SPECTRAL_WINDOW_ID.

File:

• trunk/src/MSFiller.cpp (modified) (9 diffs)

trunk/src/MSFiller.cpp

@@ -449 +449 @@
           if ( sdh.poltype == "" ) sdh.poltype = getPolType( corrtype[0] ) ;
           // source information
-          //os_ << "srcId = " << srcId << ", spwId = " << spwId << LogIO::POST ;
+//           os_ << "srcId = " << srcId << ", spwId = " << spwId << LogIO::POST ;
           MSSource srctabSel = srctab( srctab.col("SOURCE_ID") == srcId && srctab.col("SPECTRAL_WINDOW_ID") == spwId ) ;
           if ( srctabSel.nrow() == 0 ) {
             srctabSel = srctab( srctab.col("SOURCE_ID") == srcId && srctab.col("SPECTRAL_WINDOW_ID") == -1 ) ;
           }
-          tcolr = tpoolr->construct( srctabSel, "NAME" ) ;
-          String srcName = tcolr->asString( 0 ) ;
-          tpoolr->destroy( tcolr ) ;
+          String srcName( "" ) ;
+          Vector<Double> srcPM( 2, 0.0 ) ;
+          Vector<Double> srcDir( 2, 0.0 ) ;
+          MDirection md ;
+          Int numLines = 0 ;
+          ROArrayColumn<Double> *roArrDCol = 0 ;
+          if ( srctabSel.nrow() > 0 ) {
+            // source name
+            tcolr = tpoolr->construct( srctabSel, "NAME" ) ;
+            srcName = tcolr->asString( 0 ) ;
+            tpoolr->destroy( tcolr ) ;
+
+            // source proper motion
+            roArrDCol = new ROArrayColumn<Double>( srctabSel, "PROPER_MOTION" ) ;
+            srcPM = (*roArrDCol)( 0 ) ;
+            delete roArrDCol ;
+            
+            // source direction
+            roArrDCol = new ROArrayColumn<Double>( srctabSel, "DIRECTION" ) ;
+            srcDir = (*roArrDCol)( 0 ) ;
+            delete roArrDCol ;
+
+            // source direction as MDirection object
+            ROScalarMeasColumn<MDirection> *tmpMeasCol = new ROScalarMeasColumn<MDirection>( srctabSel, "DIRECTION" ) ;
+            md = (*tmpMeasCol)( 0 ) ;
+            delete tmpMeasCol ;
+
+            // number of lines
+            tcolr = tpoolr->construct( srctabSel, "NUM_LINES" ) ;
+            Int numLines = tcolr->asInt( 0 ) ;
+            tpoolr->destroy( tcolr ) ;
+
+          }
+          else {
+            md = MDirection( Quantum<Double>(0.0,Unit("rad")), Quantum<Double>(0.0,Unit("rad")) ) ;
+          }
 
           // SRCNAME
@@ -462 +495 @@
           *strRF = srcName ;
 
-          //os_ << "srcName = " << srcName << LogIO::POST ;
-          ROArrayColumn<Double> *roArrDCol = new ROArrayColumn<Double>( srctabSel, "PROPER_MOTION" ) ;
-          Array<Double> srcPM = (*roArrDCol)( 0 ) ;
-          delete roArrDCol ;
+//           os_ << "srcName = " << srcName << LogIO::POST ;
 
           // SRCPROPERMOTION
@@ -472 +502 @@
 
           //os_ << "srcPM = " << srcPM << LogIO::POST ;
-          roArrDCol = new ROArrayColumn<Double>( srctabSel, "DIRECTION" ) ;
-          Array<Double> srcDir = (*roArrDCol)( 0 ) ;
-          delete roArrDCol ;
 
           // SRCDIRECTION
@@ -481 +508 @@
 
           //os_ << "srcDir = " << srcDir << LogIO::POST ;
-          ROScalarMeasColumn<MDirection> *tmpMeasCol = new ROScalarMeasColumn<MDirection>( srctabSel, "DIRECTION" ) ;
-          MDirection md = (*tmpMeasCol)( 0 ) ;
-          delete tmpMeasCol ;
 
           // for MOLECULES subtable
-          tcolr = tpoolr->construct( srctabSel, "NUM_LINES" ) ;
-          Int numLines = tcolr->asInt( 0 ) ;
-          tpoolr->destroy( tcolr ) ;
 //           os_ << "numLines = " << numLines << LogIO::POST ;
 
@@ -504 +525 @@
               }
             }
-            //os_ << "restFreqs = " << restFreqs << LogIO::POST ;
+//             os_ << "restFreqs = " << restFreqs << LogIO::POST ;
             if ( srctabSel.tableDesc().isColumn( "TRANSITION" ) ) {
               ROArrayColumn<String> transitionCol( srctabSel, "TRANSITION" ) ;
@@ -573 +594 @@
           Double increment = (*sharedQDArrCol)( spwId )( refip ).getValue( "Hz" ) ;
           delete sharedQDArrCol ;
-          //os_ << "nchan = " << nchan << " refchan = " << refchan << "(even=" << even << ") refpix = " << refpix << LogIO::POST ;
+//           os_ << "nchan = " << nchan << " refchan = " << refchan << "(even=" << even << ") refpix = " << refpix << LogIO::POST ;
           sharedQDArrCol = new ROArrayQuantColumn<Double>( spwtab, "CHAN_FREQ" ) ;
           Vector< Quantum<Double> > chanFreqs = (*sharedQDArrCol)( spwId ) ;
@@ -652 +673 @@
             TableIterator iter5( t4, "STATE_ID" ) ; 
             while( !iter5.pastEnd() ) {
-              //time0 = gettimeofday_sec() ;
-              //os_ << "start 5th iteration: " << time0 << LogIO::POST ;
+//               time0 = gettimeofday_sec() ;
+//               os_ << "start 5th iteration: " << time0 << LogIO::POST ;
               Table t5 = iter5.table() ;
               tcolr = tpoolr->construct( t5, "STATE_ID" ) ;
@@ -664 +685 @@
 
               Int nrow = t5.nrow() ;
-              //time1 = gettimeofday_sec() ;
-              //os_ << "end 5th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//               time1 = gettimeofday_sec() ;
+//               os_ << "end 5th iteration init: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
 
               uInt cycle = 0 ;
@@ -882 +903 @@
               tpoolr->destroy( mFlagRowCol ) ;
 
-              //time1 = gettimeofday_sec() ;
-              //os_ << "end 5th iteration: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
+//               time1 = gettimeofday_sec() ;
+//               os_ << "end 5th iteration: " << time1 << " (" << time1-time0 << "sec)" << LogIO::POST ;
 
               iter5.next() ;