Changeset 66 for trunk

Timestamp:

07/19/04 10:57:50 (20 years ago)

Author:

mmarquar

Message:

Replaced class and statics with a namespace. Functions now global in the namespace SDMath

Location:

trunk/src

Files:

• SDMath.cc (modified) (10 diffs)
• SDMath.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -62 +62 @@
 
 using namespace atnf_sd;
-
-static CountedPtr<SDMemTable> SDMath::average(const CountedPtr<SDMemTable>& in) {
+//using namespace atnf_sd::SDMath;
+
+CountedPtr<SDMemTable> SDMath::average(const CountedPtr<SDMemTable>& in) {
   Table t = in->table();
   ROArrayColumn<Float> tsys(t, "TSYS");  
@@ -122 +123 @@
 }
 
-static CountedPtr<SDMemTable> 
+CountedPtr<SDMemTable> 
 SDMath::quotient(const CountedPtr<SDMemTable>& on, 
                  const CountedPtr<SDMemTable>& off) {
@@ -160 +161 @@
 }
 
-static CountedPtr<SDMemTable> 
+CountedPtr<SDMemTable> 
 SDMath::multiply(const CountedPtr<SDMemTable>& in, Float factor) {
   SDMemTable* sdmt = new SDMemTable(*in);
@@ -175 +176 @@
 }
 
-static bool SDMath::fit(Vector<Float>& thefit, const Vector<Float>& data, 
-                      const Vector<Bool>& mask,
-                      const std::string& fitexpr) {
+bool SDMath::fit(Vector<Float>& thefit, const Vector<Float>& data, 
+                const Vector<Bool>& mask,
+                const std::string& fitexpr) {
 
   LinearFit<Float> fitter;
@@ -193 +194 @@
 }
 
-static CountedPtr<SDMemTable> 
+CountedPtr<SDMemTable> 
 SDMath::baseline(const CountedPtr<SDMemTable>& in, 
                  const std::string& fitexpr,
@@ -238 +239 @@
 
 
-static CountedPtr<SDMemTable> 
+CountedPtr<SDMemTable> 
 SDMath::hanning(const CountedPtr<SDMemTable>& in) {
 
@@ -281 +282 @@
 }
 
-static CountedPtr<SDMemTable> 
+CountedPtr<SDMemTable> 
 SDMath::averages(const Block<CountedPtr<SDMemTable> >& in,
                  const Vector<Bool>& mask) {
@@ -348 +349 @@
 }
 
-static CountedPtr<SDMemTable> 
+CountedPtr<SDMemTable> 
 SDMath::averagePol(const CountedPtr<SDMemTable>& in, 
                    const Vector<Bool>& mask) {
@@ -412 +413 @@
 
 
-static Float SDMath::rms(const CountedPtr<SDMemTable>& in,
+Float SDMath::rms(const CountedPtr<SDMemTable>& in,
                          const std::vector<bool>& mask) {
   Float rmsval;
@@ -441 +442 @@
 }
 
-static CountedPtr<SDMemTable> SDMath::bin(const CountedPtr<SDMemTable>& in, 
+CountedPtr<SDMemTable> SDMath::bin(const CountedPtr<SDMemTable>& in, 
                                           Int width) {
   

trunk/src/SDMath.h

@@ -40 +40 @@
 class SDMemTable;
 
-class SDMath {
-public:
-  static CountedPtr<SDMemTable> average(const CountedPtr<SDMemTable>& in);
-  static CountedPtr<SDMemTable> quotient(const CountedPtr<SDMemTable>& on, 
+namespace SDMath {
+  //public:
+  CountedPtr<SDMemTable> average(const CountedPtr<SDMemTable>& in);
+  CountedPtr<SDMemTable> quotient(const CountedPtr<SDMemTable>& on, 
                                          const CountedPtr<SDMemTable>& off);
-  static CountedPtr<SDMemTable> multiply(const CountedPtr<SDMemTable>& in, 
+  CountedPtr<SDMemTable> multiply(const CountedPtr<SDMemTable>& in, 
                                          Float factor);
   
-  static CountedPtr<SDMemTable> baseline(const CountedPtr<SDMemTable>& in,
+  CountedPtr<SDMemTable> baseline(const CountedPtr<SDMemTable>& in,
                                          const std::string& fitexpr,
                                          const std::vector<bool>& mask);
-  static CountedPtr<SDMemTable> hanning(const CountedPtr<SDMemTable>& in);
+  CountedPtr<SDMemTable> hanning(const CountedPtr<SDMemTable>& in);
 
-  static CountedPtr<SDMemTable> 
+  CountedPtr<SDMemTable> 
   averages(const Block<CountedPtr<SDMemTable> >& in,
            const Vector<Bool>& mask);
 
-  static CountedPtr<SDMemTable> 
+  CountedPtr<SDMemTable> 
   averagePol(const CountedPtr<SDMemTable>& in, const Vector<Bool>& mask);
 
-  static Float rms(const CountedPtr<SDMemTable>& in, 
+  Float rms(const CountedPtr<SDMemTable>& in, 
                    const std::vector<bool>& mask);
   
-  static CountedPtr<SDMemTable> bin(const CountedPtr<SDMemTable>& in, 
-                                    Int width);
+  CountedPtr<SDMemTable> bin(const CountedPtr<SDMemTable>& in, 
+                             Int width);
   
-private:
-  static bool fit(Vector<Float>& thefit, const Vector<Float>& data, 
+  bool fit(Vector<Float>& thefit, const Vector<Float>& data, 
                   const Vector<Bool>& mask, const std::string& fitexpr);