Changeset 473 for trunk/src

Timestamp:

02/18/05 11:17:24 (20 years ago)

Author:

kil064

Message:

fix bug in setFlags to do with Xpol and iterating

File:

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

trunk/src/SDContainer.cc

@@ -189 +189 @@
 // spectrum_ is [,,,nChan]
 // How annoying.
-// nPol==2 
 {
 
@@ -230 +229 @@
 //
 // flags is [nChan,nPol] 
-// flags_ is [,,,nChan]
-// How annoying.
-// there are no separate flags for XY so make
-// them up from X and Y
+// flags_ is [nBeam,nIF,nPol,nChan]
+//
+// Note that there are no separate flags for the XY cross polarization so we make
+// them up from the X and Y which is all the silly code below.  This means
+// that nPol==2 on input but 4 on output
 //
 {
@@ -271 +271 @@
            }
         }
-//
         inIt.next();
      } else if (pos(asap::PolAxis)==2) {
-        outIt.vector() = maskPol01;
+        if (hasXPol) {
+           outIt.vector() = maskPol01;
+        } else {
+           outIt.vector() = inIt.vector();
+           inIt.next();
+        }
+
      } else if (pos(asap::PolAxis)==3) { 
-        outIt.vector() = maskPol01;
+        if (hasXPol) {
+           outIt.vector() = maskPol01;
+        } else {
+           outIt.vector() = inIt.vector();
+           inIt.next();
+        }
      }
-//
      outIt.next();
   }
@@ -290 +299 @@
                           Bool hasXpol)
 //
+// TSys shape is [nPol]
 // Tsys does not depend upon channel but is replicated
 // for simplicity of use.
@@ -317 +327 @@
        outIt.vector() = tsys(i++);
      } else {
-       outIt.vector() = sqrt(tsys[0]*tsys[1]);
+       if (hasXpol) {
+          outIt.vector() = sqrt(tsys[0]*tsys[1]);
+       } else {
+          outIt.vector() = tsys(i++);
+       }
      }
 //
@@ -385 +399 @@
 //
 // Input  [nBeam,nIF,nPol,nChan]
-// Output [nPol]   (drop channel dependency and select first value)
+// Output [nPol]   (drop channel dependency and select first value only)
 // 
 {