Changeset 1757 for branches/alma/src/STDefs.h

Timestamp:

06/09/10 19:03:06 (16 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/STDefs.h (modified) (2 diffs)

branches/alma/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};