Changeset 48 for trunk/src/SDMath.h

Timestamp:

07/15/04 15:48:41 (20 years ago)

Author:

mmarquar

Message:

Fixed various defects. Added averaging of multiple scans, rms, and reworked baseline fitting.

File:

• trunk/src/SDMath.h (modified) (1 diff)

trunk/src/SDMath.h

@@ -48 +48 @@
                                          Float factor);
   
-  static std::vector<float> baseline(const CountedPtr<SDMemTable>& in,
-                                     const std::string& fitexpr );
+  static CountedPtr<SDMemTable> baseline(const CountedPtr<SDMemTable>& in,
+                                         const std::string& fitexpr,
+                                         const std::vector<bool>& mask);
   static CountedPtr<SDMemTable> hanning(const CountedPtr<SDMemTable>& in);
+
+  static CountedPtr<SDMemTable> 
+  averages(const Block<CountedPtr<SDMemTable> >& in,
+           const Vector<Bool>& mask);
+
+  static CountedPtr<SDMemTable> 
+  averagePol(const CountedPtr<SDMemTable>& in, const Vector<Bool>& mask);
+
+  static Float rms(const CountedPtr<SDMemTable>& in, 
+                   const std::vector<bool>& mask);
+  
+  static CountedPtr<SDMemTable> bin(const CountedPtr<SDMemTable>& in, 
+                                    Int width);
+  
+private:
+  static bool fit(Vector<Float>& thefit, const Vector<Float>& data, 
+                  const Vector<Bool>& mask, const std::string& fitexpr);
   
 };