Changeset 1462 for trunk/src

Timestamp:

01/14/09 12:25:25 (16 years ago)

Author:

Malte Marquarding

Message:

change in PKSIO api

Location:

trunk/src

Files:

• STFiller.cpp (modified) (3 diffs)
• STWriter.cpp (modified) (2 diffs)

trunk/src/STFiller.cpp

@@ -250 +250 @@
     // fields that don't get used and are just passed through asap
     RecordFieldPtr<Array<Double> > srateCol(rec, "SCANRATE");
-    *srateCol = pksrec.scanRate;
+    // MRC changed type from double to float
+    Vector<Double> sratedbl;
+    convertArray(sratedbl, pksrec.scanRate);
+    *srateCol = sratedbl;
     RecordFieldPtr<Array<Double> > spmCol(rec, "SRCPROPERMOTION");
     *spmCol = pksrec.srcPM;
@@ -340 +343 @@
 
       *specCol = pksrec.spectra.column(i);
-      *flagCol = pksrec.flagtra.column(i);
+      *flagCol = pksrec.flagged.column(i);
       table_->table().addRow();
       row.put(table_->table().nrow()-1, rec);
@@ -354 +357 @@
       // make up flags from linears
       /// @fixme this has to be a bitwise or of both pols
-      *flagCol = pksrec.flagtra.column(0);// | pksrec.flagtra.column(1);
+      *flagCol = pksrec.flagged.column(0);// | pksrec.flagged.column(1);
       table_->table().addRow();
       row.put(table_->table().nrow()-1, rec);

trunk/src/STWriter.cpp

@@ -170 +170 @@
       TableIterator cycit(btable, "CYCLENO");
       ROArrayColumn<Double> srateCol(btable, "SCANRATE");
-      srateCol.get(0, pksrec.scanRate);
+      Vector<Double> sratedbl;
+      Vector<Float> srateflt;
+      srateCol.get(0, sratedbl);
+      convertArray(srateflt, sratedbl);
+      pksrec.scanRate = srateflt;
       ROArrayColumn<Double> spmCol(btable, "SRCPROPERMOTION");
       spmCol.get(0, pksrec.srcPM);
@@ -212 +216 @@
           pksrec.refFreq = (pixel-crpix)*pksrec.freqInc + crval;
           // ok, now we have nrows for the n polarizations in this table
-          polConversion(pksrec.spectra, pksrec.flagged, pksrec.xpol, itable);
+          polConversion(pksrec.spectra, pksrec.flagged, pksrec.xPol, itable);
           pksrec.tsys = tsysFromTable(itable);
           // dummy data
-          uInt npol = spectra.ncolumn();
+          uInt npol = pksrec.spectra.ncolumn();
 
           pksrec.mjd       = rec.asDouble("TIME");