Changeset 107 for trunk

Timestamp:

12/01/04 10:58:27 (20 years ago)

Author:

mar637

Message:

added 'add' function

Location:

trunk/src

Files:

• SDMath.cc (modified) (1 diff)
• SDMath.h (modified) (1 diff)
• SDMathWrapper.h (modified) (1 diff)
• python_SDMath.cc (modified) (1 diff)

trunk/src/SDMath.cc

@@ -175 +175 @@
   return CountedPtr<SDMemTable>(sdmt);
 }
+
+CountedPtr<SDMemTable>
+SDMath::add(const CountedPtr<SDMemTable>& in, Float offset) {
+  SDMemTable* sdmt = new SDMemTable(*in);
+  Table t = sdmt->table();
+  ArrayColumn<Float> spec(t,"SPECTRA");
+
+  for (uInt i=0; i < t.nrow(); i++) {
+    // data stuff
+    MaskedArray<Float> marr(sdmt->rowAsMaskedArray(i));
+    marr += offset;
+    spec.put(i, marr.getArray());
+  }
+  return CountedPtr<SDMemTable>(sdmt);
+}
+
+
 
 bool SDMath::fit(Vector<Float>& thefit, const Vector<Float>& data,

trunk/src/SDMath.h

@@ -46 +46 @@
                                          const CountedPtr<SDMemTable>& off);
   CountedPtr<SDMemTable> multiply(const CountedPtr<SDMemTable>& in, 
-                                         Float factor);
+                                  Float factor);
+  CountedPtr<SDMemTable> add(const CountedPtr<SDMemTable>& in, 
+                             Float offset);
   
   CountedPtr<SDMemTable> baseline(const CountedPtr<SDMemTable>& in,

trunk/src/SDMathWrapper.h

@@ -58 +58 @@
   }
 
+  SDMemTableWrapper add(const SDMemTableWrapper& in,
+                        Float offset) {
+    return SDMemTableWrapper(SDMath::add(in.getCP(), offset));
+  }
+
   SDMemTableWrapper hanning(const SDMemTableWrapper& in) {
     return SDMemTableWrapper(SDMath::hanning(in.getCP()));

trunk/src/python_SDMath.cc

@@ -58 +58 @@
       def("quotient", &SDMathWrapper::quotient);
       def("scale", &SDMathWrapper::scale);
+      def("add", &SDMathWrapper::add);
       def("baseline", &SDMathWrapper::baseline);
       def("hanning", &SDMathWrapper::hanning);