Changeset 1586 for trunk/src/STFiller.cpp

Timestamp:

06/30/09 15:46:14 (15 years ago)

Author:

Malte Marquarding

Message:

Ticket #165: have removed the hard-coding of parallactifying the data. NOTE THIS breaks the Table structure as I have moved the PARANGLE column from the main table into the FOCUS table. We need to have a new release. Also one needs to explicitly tell the scantable via rc or member function to enable parallactifying

File:

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

trunk/src/STFiller.cpp

@@ -216 +216 @@
     }
   }
-     
+  //table_->focus().setParallactify(true);
 }
 
@@ -300 +300 @@
     /// @todo this has to change when nchan isn't global anymore
     id = table_->frequencies().addEntry(Double(header_->nchan/2),
-                                            pksrec.refFreq, pksrec.freqInc);
+                                        pksrec.refFreq, pksrec.freqInc);
     RecordFieldPtr<uInt> mfreqidCol(rec, "FREQ_ID");
     *mfreqidCol = id;
@@ -316 +316 @@
     RecordFieldPtr<uInt> mweatheridCol(rec, "WEATHER_ID");
     *mweatheridCol = id;
+
     RecordFieldPtr<uInt> mfocusidCol(rec, "FOCUS_ID");
-    id = table_->focus().addEntry(pksrec.focusAxi, pksrec.focusTan,
-                                  pksrec.focusRot);
+    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi, 
+                                  pksrec.focusTan, pksrec.focusRot);
     *mfocusidCol = id;
     RecordFieldPtr<Array<Double> > dirCol(rec, "DIRECTION");
@@ -326 +327 @@
     RecordFieldPtr<Float> elCol(rec, "ELEVATION");
     *elCol = pksrec.elevation;
-
-    RecordFieldPtr<Float> parCol(rec, "PARANGLE");
-    *parCol = pksrec.parAngle;
 
     RecordFieldPtr< Array<Float> > specCol(rec, "SPECTRA");