Changeset 2749

Timestamp:

01/28/13 16:46:26 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

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

Bug fix for the case when only one row is selected in a certain iteration
loop.

Location:

trunk/src

Files:

• STCalSkyPSAlma.cpp (modified) (1 diff)
• STCalTsys.cpp (modified) (3 diffs)
• STCalibration.h (modified) (2 diffs)

trunk/src/STCalSkyPSAlma.cpp

@@ -75 +75 @@
       continue;
     }
+    else if (len == 1) {
+      STCalSkyTable *p = dynamic_cast<STCalSkyTable *>(&(*applytable_));
+      uInt irow = rows[0];
+      p->appenddata(0, 0, current[2], current[0], current[1], 
+                    freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow));
+      iter.next();
+      continue;
+    }
     
     uInt nchan = scantable_->nchan(scantable_->getIF(rows[0]));

trunk/src/STCalTsys.cpp

@@ -72 +72 @@
     Vector<uInt> rows = iter.getRows(SHARE);
     Vector<uInt> current = iter.current();
+    //os_ << "current=" << current << LogIO::POST;
     uInt len = rows.nelements();
     if (len == 0) {
+      iter.next();
+      continue;
+    }
+    else if (len == 1) {
+      STCalTsysTable *p = dynamic_cast<STCalTsysTable *>(&(*applytable_));
+      uInt irow = rows[0];
+      p->appenddata(0, 0, current[2], current[0], current[1], 
+                    freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow));
       iter.next();
       continue;
@@ -93 +102 @@
     uInt jrow ;
     for (uInt i = 0; i < len; i++) {
+      //os_ << "start row " << rows[i] << LogIO::POST;
       irow = rows[i];
       jrow = (i < len-1) ? rows[i+1] : rows[i];
@@ -131 +141 @@
 
     iter.next() ;
+    //os_ << "end " << current << LogIO::POST;
   }
 }

trunk/src/STCalibration.h

@@ -19 +19 @@
 #include <casa/BasicSL/String.h>
 #include <casa/Utilities/CountedPtr.h>
+#include <casa/Logging/LogIO.h>
 
 #include <scimath/Mathematics/InterpolateArray1D.h>
@@ -50 +51 @@
   casa::CountedPtr<Scantable> scantable_;
   casa::CountedPtr<STApplyTable> applytable_; 
+  casa::LogIO os_;
 };