Changeset 1569 for trunk/src/STMath.cpp

Timestamp:

06/29/09 12:00:27 (15 years ago)

Author:

Malte Marquarding

Message:

Fix enum problem with WeightType? enum value already defined somewhere by adding W_ prefix. ALso removed enums which are no longer in use

File:

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

trunk/src/STMath.cpp

@@ -47 +47 @@
 #include "RowAccumulator.h"
 #include "STAttr.h"
+#include "STSelector.h"
+
 #include "STMath.h"
-#include "STSelector.h"
-
 using namespace casa;
 
@@ -330 +330 @@
 }
 
-CountedPtr<Scantable> STMath::binaryOperate(const CountedPtr<Scantable>& left, 
-                                            const CountedPtr<Scantable>& right, 
+CountedPtr<Scantable> STMath::binaryOperate(const CountedPtr<Scantable>& left,
+                                            const CountedPtr<Scantable>& right,
                                             const std::string& mode)
 {
@@ -1176 +1176 @@
   // initialize the lookup table if necessary
   if ( lookup.empty() ) {
-    lookup["NONE"]   = asap::NONE;
-    lookup["TINT"] = asap::TINT;
-    lookup["TINTSYS"]  = asap::TINTSYS;
-    lookup["TSYS"]  = asap::TSYS;
-    lookup["VAR"]  = asap::VAR;
+    lookup["NONE"]   = asap::W_NONE;
+    lookup["TINT"] = asap::W_TINT;
+    lookup["TINTSYS"]  = asap::W_TINTSYS;
+    lookup["TSYS"]  = asap::W_TSYS;
+    lookup["VAR"]  = asap::W_VAR;
   }
 
@@ -1620 +1620 @@
   cols[3] = String("CYCLENO");
   TableIterator iter(tout, cols);
-  CountedPtr<STPol> stpol = STPol::getPolClass(out->factories_, 
+  CountedPtr<STPol> stpol = STPol::getPolClass(out->factories_,
                                                out->getPolType() );
   while (!iter.pastEnd()) {