Changeset 7 for trunk

Timestamp:

06/24/04 11:39:45 (20 years ago)

Author:

mmarquar

Message:

Changed Tsys vector to be of the same dimensionality as the spectrum. This makes it easier to use.

Location:

trunk/src

Files:

• SDContainer.cc (modified) (3 diffs)
• SDContainer.h (modified) (1 diff)

trunk/src/SDContainer.cc

@@ -45 +45 @@
   spectrum_(IPosition(4,nBeam,nIF,nChan,nPol)),
   flags_(IPosition(4,nBeam,nIF,nChan,nPol)),
-  tsys_(IPosition(3,nBeam,nIF,nPol)) {
+  tsys_(IPosition(4,nBeam,nIF,nChan,nPol)) {
   uChar x = 0;
   flags_ = ~x;
@@ -56 +56 @@
   spectrum_ = spec;
 }
-Bool SDContainer::putFlags(const Array<uChar>& spec) {
-  flags_ = spec;
+Bool SDContainer::putFlags(const Array<uChar>& flag) {
+  flags_ = flag;
 }
-Bool SDContainer::putTsys(const Array<Float>& spec) {
-  tsys_ = spec;
+Bool SDContainer::putTsys(const Array<Float>& tsys) {
+  tsys_ = tsys;
 }
 
@@ -128 +128 @@
   // assert dimensions are the same....
   uInt idx = 0;
-  for (ArrayAccessor<Float, Axis<2> > i(aa1);i != i.end(); ++i) {
-    (*i) = tsys[idx];
-    idx++;
-  }  
+  
+  for (ArrayAccessor<Float, Axis<2> > i(aa1);i != i.end(); ++i) {    
+    idx = 0;
+    for (ArrayAccessor<Float, Axis<3> > ii(i);ii != ii.end(); ++ii) {
+      (*ii) = tsys[idx];
+      idx++;
+    }
+  }
 }

trunk/src/SDContainer.h

@@ -99 +99 @@
   Array<Float>    spectrum_;  
   Array<uChar>    flags_;
-  // (nBeam,nIF,nPol)
+  // (nBeam,nIF,[nChannel],nPol) Tsys is not really a function of
+  // channel, but this makes it easier to work with at the expense of
+  // a little memory
   Array<Float>    tsys_;
   Array<Float>    tcal_;