Changeset 1569 for trunk

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

Location:

trunk/src

Files:

• RowAccumulator.cpp (modified) (3 diffs)
• RowAccumulator.h (modified) (1 diff)
• STDefs.h (modified) (2 diffs)
• STMath.cpp (modified) (4 diffs)

trunk/src/RowAccumulator.cpp

@@ -67 +67 @@
   Float totalweight = weight;
   MaskedArray<Float> data(v,m);
-  if ( weightType_ == asap::VAR ) {
+  if ( weightType_ == asap::W_VAR ) {
     if (m.nelements() == userMask_.nelements()) {
       Float fac = 1.0/variance(data(userMask_));
@@ -90 +90 @@
   Float w = 1.0;
   tsysSum_ += v[0];
-  if ( weightType_ == asap::TSYS  || weightType_ == asap::TINTSYS ) {
+  if ( weightType_ == asap::W_TSYS  || weightType_ == asap::W_TINTSYS ) {
     w /= (v[0]*v[0]);
   }
@@ -105 +105 @@
   Float w = 1.0;
   intervalSum_ += inter;
-  if ( weightType_ == asap::TINT || weightType_ == asap::TINTSYS ) {
+  if ( weightType_ == asap::W_TINT || weightType_ == asap::W_TINTSYS ) {
     w /= Float(inter);
   }

trunk/src/RowAccumulator.h

@@ -33 +33 @@
    * Constructor taking a weight type as defined in @ref STDefs
    */
-  explicit RowAccumulator(WeightType wt = asap::NONE);
+  explicit RowAccumulator(WeightType wt = asap::W_NONE);
 
  ~RowAccumulator();

trunk/src/STDefs.h

@@ -34 +34 @@
 
 namespace asap {
-  enum AxisNo { BeamAxis=0,
-                IFAxis,
-                PolAxis,
-                ChanAxis,
-                nAxes};
 
   enum Instrument {UNKNOWNINST=0,
@@ -53 +48 @@
   enum FeedPolType {UNKNOWNFEED, LINEAR, CIRCULAR, N_POL};
 
-  enum WeightType {NONE=0, VAR, TSYS, TINT, TINTSYS, N_WEIGHTTYPES};
-
-  enum TableType {MEMORY=0, PERSISTENT};
-
+  enum WeightType {W_NONE=0, W_VAR, W_TSYS, W_TINT, W_TINTSYS, W_N_WEIGHTTYPES};
 
 

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()) {