Changeset 1459 for branches/alma/src

Timestamp:

12/18/08 15:50:01 (16 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1084

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: Execute sdcal or sdaverage with scanaverage=True.

Put in Release Notes: No

Description: Fixed a bug in the task sdcal and sdaverage

that a calibration is failed when scanaverage
is set to True.

File:

• branches/alma/src/STMath.cpp (modified) (2 diffs)

branches/alma/src/STMath.cpp

@@ -113 +113 @@
   }
   if ( avmode == "SCAN"  && in.size() == 1) {
-    cols.resize(4);
-    cols[3] = String("SCANNO");
+    //cols.resize(4);
+    //cols[3] = String("SCANNO");
+    cols.resize(5);
+    cols[3] = String("SRCNAME");
+    cols[4] = String("SCANNO");
   }
   uInt outrowCount = 0;
@@ -154 +157 @@
         subt = basesubt( basesubt.col("SRCNAME") == rec.asString("SRCNAME") );
       } else if (avmode == "SCAN") {
-        subt = basesubt( basesubt.col("SCANNO") == Int(rec.asuInt("SCANNO")) );
+        //subt = basesubt( basesubt.col("SCANNO") == Int(rec.asuInt("SCANNO")) );
+        subt = basesubt( basesubt.col("SCANNO") == Int(rec.asuInt("SCANNO"))
+                         && basesubt.col("SRCNAME") == rec.asString("SRCNAME") );
       } else {
         subt = basesubt;