Changeset 2534 for branches

Timestamp:

05/16/12 18:32:05 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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

calibrateALMA will do nothing when input ON scantable is empty row.

File:

• branches/hpc33/src/STMath.cpp (modified) (4 diffs)

branches/hpc33/src/STMath.cpp

@@ -3922 +3922 @@
     vector< CountedPtr<Scantable> > tmp( 1, soff ) ;
     CountedPtr<Scantable> aoff = average( tmp, masks, "TINT", "SCAN" ) ;
-//     cout << "elapsed time for average(): " << mathutil::gettimeofday_sec()-t2 << " sec" << endl ; 
+//     double t3 = mathutil::gettimeofday_sec() ;
     //cout << "aoff.nrow = " << aoff->nrow() << endl ;
     s->unsetSelection() ;
@@ -3928 +3928 @@
 //     t1 = mathutil::gettimeofday_sec() ;
 //     cout << "elapsed time for off averaging: " << t1-t0 << " sec" << endl ;
+//     cout << "   elapsed time for average(): " << t3-t2 << " sec" << endl ;
     
     // on scan
@@ -5112 +5113 @@
                             CountedPtr<Scantable>& off )
 {
+  if ( on->nrow() == 0 )
+    return ;
   //   string reftime = on->getTime( index ) ;
   ROScalarColumn<Double> timeCol( off->table(), "TIME" ) ;
@@ -5148 +5151 @@
                             Vector<uInt>& rows )
 {
+  // if rows is empty, just return
+  if ( rows.nelements() == 0 )
+    return ;
 //   string reftime = on->getTime( index ) ;
   ROScalarColumn<Double> timeCol( off->table(), "TIME" ) ;