Changeset 1505 for trunk

Timestamp:

02/13/09 11:28:39 (16 years ago)

Author:

Malte Marquarding

Message:

use addRow before copyRows consistently; tidy up of getScantable

File:

• trunk/src/STMath.cpp (modified) (3 diffs)

trunk/src/STMath.cpp

@@ -130 +130 @@
     ++iter;
   }
+
   RowAccumulator acc(wtype);
   Vector<Bool> cmask(mask);
@@ -285 +286 @@
                                              bool droprows)
 {
-  if (insitu_) return in;
+  if (insitu_) {
+    return in;
+  }
   else {
     // clone
-    Scantable* tabp = new Scantable(*in, Bool(droprows));
-    return CountedPtr<Scantable>(tabp);
+    return CountedPtr<Scantable>(new Scantable(*in, Bool(droprows)));
   }
 }
@@ -1554 +1556 @@
         Table thetab = freqit.table();
         uInt nrow = tout.nrow();
-        //tout.addRow(thetab.nrow());
+        tout.addRow(thetab.nrow());
         TableCopy::copyRows(tout, thetab, nrow, 0, thetab.nrow());
         ROTableRow row(thetab);