Changeset 171 for trunk/src/SDMath.cc

Timestamp:

01/06/05 14:05:54 (19 years ago)

Author:

kil064

Message:

implement insitu version of Hanning smoothing

File:

• trunk/src/SDMath.cc (modified) (4 diffs)

trunk/src/SDMath.cc

@@ -349 +349 @@
 // Output Table cloned from input
 
-  SDMemTable* sdmt = new SDMemTable(*on, True);
+  SDMemTable* pTabOut = new SDMemTable(*on, True);
 
 // Loop over rows
@@ -383 +383 @@
 // Put new row in output Table
 
-     sdmt->putSDContainer(sc);
-  }
-//
-  return CountedPtr<SDMemTable>(sdmt);
-}
-
-
-
-CountedPtr<SDMemTable>
-SDMath::hanning(const CountedPtr<SDMemTable>& in) 
+     pTabOut->putSDContainer(sc);
+  }
+//
+  return CountedPtr<SDMemTable>(pTabOut);
+}
+
+
+
+SDMemTable* SDMath::hanning(const SDMemTable& in) 
 //
 // Hanning smooth each row
@@ -398 +397 @@
 //
 {
-  SDMemTable* sdmt = new SDMemTable(*in,True);
+  SDMemTable* pTabOut = new SDMemTable(in,True);
 
 // Loop over rows in Table
 
-  for (uInt ri=0; ri < in->nRow(); ++ri) {
+  for (uInt ri=0; ri < in.nRow(); ++ri) {
 
 // Get data
     
-    const MaskedArray<Float>& marr(in->rowAsMaskedArray(ri));
+    const MaskedArray<Float>& marr(in.rowAsMaskedArray(ri));
     Array<Float> arr = marr.getArray();
     Array<Bool> barr = marr.getMask();
@@ -428 +427 @@
 // Create and put back
 
-    SDContainer sc = in->getSDContainer(ri);
+    SDContainer sc = in.getSDContainer(ri);
     putDataInSDC (sc, arr, barr);
 //
-    sdmt->putSDContainer(sc);
-  }
-  return CountedPtr<SDMemTable>(sdmt);
+    pTabOut->putSDContainer(sc);
+  }
+//
+  return pTabOut;
 }