Changeset 799 for branches/Release12

Timestamp:

12/23/05 09:52:30 (19 years ago)

Author:

phi196

Message:

Bug in swappol, minor indentation reformat

File:

• branches/Release12/src/SDMath.cc (modified) (4 diffs)

branches/Release12/src/SDMath.cc

@@ -1394 +1394 @@
   }
 
-  //SDHeader sh = in.getSDHeader();
-  //Instrument inst = SDAttr::convertInstrument(sh.antennaname, False);
-  //   SDAttr sdAtt;
-  // if (sdAtt.feedPolType(inst) != LINEAR) {
-  //   throw(AipsError("Only linear polarizations are supported"));
-  //}
-//
-   const Table& tabIn = in.table();
-   ArrayColumn<Float> specCol(tabIn,"SPECTRA");
-   IPosition start(asap::nAxes,0);
-   IPosition end(asap::nAxes);
+  const Table& tabIn = in.table();
+  ArrayColumn<Float> specCol(tabIn,"SPECTRA");
+  IPosition start(asap::nAxes,0);
+  IPosition end(asap::nAxes);
 
 // Set cursor slice. Assumes shape the same for all rows
 
-   setCursorSlice (start, end, doAll, in);
-
-   IPosition start4(start);
-   start4(asap::PolAxis) = 3;                 // Imag (XY)
-   IPosition end4(end);
-   end4(asap::PolAxis) = 3;
-//
-   uInt nRow = in.nRow();
-   Array<Float> data;
-   for (uInt i=0; i<nRow;++i) {
-      specCol.get(i,data);
-      IPosition shape = data.shape();
-
-      // Get polarization slice references
-      Array<Float> C4 = data(start4,end4);
-
-      // Invert
-      C4 *= -1.0f;
-
-      // Put
-      specCol.put(i,data);
-   }
+  setCursorSlice (start, end, doAll, in);
+
+  IPosition start4(start);
+  start4(asap::PolAxis) = 3;                 // Imag (XY)
+  IPosition end4(end);
+  end4(asap::PolAxis) = 3;
+
+  uInt nRow = in.nRow();
+  Array<Float> data;
+  for (uInt i=0; i<nRow;++i) {
+    specCol.get(i,data);
+    IPosition shape = data.shape();
+
+    // Get polarization slice references
+    Array<Float> C4 = data(start4,end4);
+
+    // Invert
+    C4 *= Float(-1.0);
+    
+    specCol.put(i,data);
+  }
 }
 
@@ -1441 +1433 @@
       throw(AipsError("You must have 2 or 4 polarizations to run this function"));
    }
-//
-//   SDHeader sh = in.getSDHeader();
-//   Instrument inst = SDAttr::convertInstrument(sh.antennaname, False);
-//   SDAttr sdAtt;
-   //  if (sdAtt.feedPolType(inst) != LINEAR) {
-   //   throw(AipsError("Only linear polarizations are supported"));
-   //  }
-//
+
    const Table& tabIn = in.table();
    ArrayColumn<Float> specCol(tabIn,"SPECTRA");
@@ -1458 +1443 @@
 
    setCursorSlice (start, end, doAll, in);
-//
+
    IPosition start1(start);
    start1(asap::PolAxis) = 0;                // C1 (XX)
    IPosition end1(end);
    end1(asap::PolAxis) = 0;
-//
+
    IPosition start2(start);
    start2(asap::PolAxis) = 1;                 // C2 (YY)
    IPosition end2(end);
    end2(asap::PolAxis) = 1;
-//
+
    uInt nRow = in.nRow();
    Array<Float> data, stokes;
@@ -1482 +1467 @@
 
 // Swap
-
       Array<Float> tmp;
       tmp = C1;
       C1 = C2;
-      C2 = C1;
-
-// Put
+      C2 = tmp;
 
       specCol.put(i,data);