Changeset 1008 for trunk/src

Timestamp:

04/11/06 12:14:35 (19 years ago)

Author:

mar637

Message:

Fix for Ticket #18, frequency switching broken

File:

• trunk/src/STMath.cpp (modified) (4 diffs)

trunk/src/STMath.cpp

@@ -91 +91 @@
   ScalarColumn<Double> mjdColOut(tout,"TIME");
   ScalarColumn<Double> intColOut(tout,"INTERVAL");
+  ScalarColumn<uInt> cycColOut(tout,"CYCLENO");
 
   // set up the output table rows. These are based on the structure of the
@@ -176 +177 @@
     intColOut.put(i, acc.getInterval());
     mjdColOut.put(i, acc.getTime());
+    // we should only have one cycle now -> reset it to be 0
+    // frequency switched data has different CYCLENO for different IFNO
+    // which requires resetting this value
+    cycColOut.put(i, uInt(0));
     acc.reset();
   }
@@ -321 +326 @@
   CountedPtr< Scantable > out = getScantable(in, false);
   Table& tout = out->table();
-  Block<String> cols(3);
+  Block<String> cols(4);
   cols[0] = String("SCANNO");
-  cols[1] = String("BEAMNO");
-  cols[2] = String("POLNO");
+  cols[1] = String("CYCLENO");
+  cols[2] = String("BEAMNO");
+  cols[3] = String("POLNO");
   TableIterator iter(tout, cols);
   while (!iter.pastEnd()) {
@@ -332 +338 @@
       continue;
     }
-    ArrayColumn<Float> specCol(tout, "SPECTRA");
-    ArrayColumn<Float> tsysCol(tout, "TSYS");
-    ArrayColumn<uChar> flagCol(tout, "FLAGTRA");
+    ArrayColumn<Float> specCol(subt, "SPECTRA");
+    ArrayColumn<Float> tsysCol(subt, "TSYS");
+    ArrayColumn<uChar> flagCol(subt, "FLAGTRA");
     Vector<Float> onspec,offspec, ontsys, offtsys;
     Vector<uChar> onflag, offflag;