Changeset 685 for trunk/src

Timestamp:

09/22/05 12:12:20 (19 years ago)

Author:

mar637

Message:

forgot to change some hardcoded axes. Now using asap::AxisNo everywhere.

File:

• trunk/src/SDContainer.cc (modified) (10 diffs)

trunk/src/SDContainer.cc

@@ -87 +87 @@
 
 SDContainer::SDContainer(IPosition shp) 
-  : nBeam_(shp(0)),
-    nIF_(shp(1)),
-    nPol_(shp(2)),
-    nChan_(shp(3)),
+  : nBeam_(shp(asap::BeamAxis)),
+    nIF_(shp(asap::IFAxis)),
+    nPol_(shp(asap::PolAxis)),
+    nChan_(shp(asap::ChanAxis)),
     spectrum_(shp),
     flags_(shp),
     tsys_(shp),
-    freqidx_(shp(1)),
-    restfreqidx_(shp(1)) {
-  IPosition ip(2,shp(0),2);
+    freqidx_(shp(asap::IFAxis)),
+    restfreqidx_(shp(asap::IFAxis)) {
+  IPosition ip(2,shp(asap::BeamAxis),2);
   direction_.resize(ip);
   uChar x = 0;
@@ -107 +107 @@
 
 Bool SDContainer::resize(IPosition shp) {
-  nBeam_ = shp(0);
-  nIF_ = shp(1);
-  nPol_ = shp(2);
-  nChan_ = shp(3);
+  nBeam_ = shp(asap::BeamAxis);
+  nIF_ = shp(asap::IFAxis);
+  nPol_ = shp(asap::PolAxis);
+  nChan_ = shp(asap::ChanAxis);
   spectrum_.resize(shp);
   flags_.resize(shp);
   tsys_.resize(shp);
-  freqidx_.resize(shp(1));
-  restfreqidx_.resize(shp(1));
-  IPosition ip(2,shp(0),2);
+  freqidx_.resize(shp(asap::IFAxis));
+  restfreqidx_.resize(shp(asap::IFAxis));
+  IPosition ip(2,shp(asap::BeamAxis),2);
   direction_.resize(ip);
 }
@@ -148 +148 @@
   Bool xPol = True;
   IPosition start, end;
-  setSlice (start, end, spec.shape(), spectrum_.shape(),
+  setSlice(start, end, spec.shape(), spectrum_.shape(),
             whichBeam, whichIF, tSys, xPol);
 
@@ -194 +194 @@
 
   IPosition start, end;
-  setSlice (start, end, spec.shape(), spectrum_.shape(),
+  setSlice(start, end, spec.shape(), spectrum_.shape(),
             whichBeam, whichIF, False, False);
 
@@ -221 +221 @@
 }
 
-
-
-
 Bool SDContainer::setFlags(const Matrix<uChar>& flags,
                            uInt whichBeam, uInt whichIF,
@@ -241 +238 @@
 
   IPosition start, end;
-  setSlice (start, end, flags.shape(), flags_.shape(),
+  setSlice(start, end, flags.shape(), flags_.shape(),
             whichBeam, whichIF, False, hasXPol);
 
@@ -310 +307 @@
 
   IPosition start, end;
-  setSlice (start, end, tsys.shape(), tsys_.shape(),
+  setSlice(start, end, tsys.shape(), tsys_.shape(),
             whichBeam, whichIF, True, hasXpol);
 
@@ -350 +347 @@
 
   IPosition start, end;
-  setSlice (start, end, spectrum_.shape(), whichBeam, whichIF);
+  setSlice(start, end, spectrum_.shape(), whichBeam, whichIF);
 //
   Array<Float> dataIn = spectrum_(start,end);
@@ -379 +376 @@
 
   IPosition start, end;
-  setSlice (start, end, flags_.shape(), whichBeam, whichIF);
+  setSlice(start, end, flags_.shape(), whichBeam, whichIF);
 //
   Array<uChar> dataIn = flags_(start,end);
@@ -405 +402 @@
 
   IPosition start, end;
-  setSlice (start, end, spectrum_.shape(), whichBeam, whichIF);
+  setSlice(start, end, spectrum_.shape(), whichBeam, whichIF);
 //
   Array<Float> dataIn = tsys_(start,end);