Changeset 1780 for branches/newfiller/src/FillerBase.cpp

Timestamp:

07/29/10 21:42:50 (14 years ago)

Author:

Malte Marquarding

Message:

make filler code compile

File:

• branches/newfiller/src/FillerBase.cpp (modified) (8 diffs)

branches/newfiller/src/FillerBase.cpp

@@ -11 +11 @@
 //
 
-#include "FillberBase.h"
+#include <casa/Containers/RecordField.h>
+
+#include "FillerBase.h"
 
 using namespace casa;
@@ -18 +20 @@
 {
 FillerBase::FillerBase() :
-  table_(0),
+  table_(0)
 {
 }
@@ -38 +40 @@
   RecordFieldPtr<uInt> polCol(row_.record(), "POLNO");
   RecordFieldPtr<uInt> cycleCol(row_.record(), "CYCLENO");
-  RecordFieldPtr<uInt> scanColCol(row_.record(), "SCANNO");
+  RecordFieldPtr<uInt> scanCol(row_.record(), "SCANNO");
   *beamCol = beamno;
   *cycleCol = cycleno;
@@ -47 +49 @@
 
 void FillerBase::setFrequency(Double refpix, Double refval,
-                              Double incr);
+                              Double incr)
 {
   /// @todo this has to change when nchan isn't global anymore
@@ -57 +59 @@
 
 
-void FillerBase::setMolecule(Double restfreq)
+void FillerBase::setMolecule(const Vector<Double>& restfreq)
 {
-  uInt id = table_->molecules().addEntry(restfreq);
+  Vector<String> tmp;
+  uInt id = table_->molecules().addEntry(restfreq, tmp, tmp);
   RecordFieldPtr<uInt> molidCol(row_.record(), "MOLECULE_ID");
   *molidCol = id;
 }
 
-void FillerBase::setDirection(const Vector<Double>& dir.
+void FillerBase::setDirection(const Vector<Double>& dir,
                               Float az, Float el)
 {
@@ -112 +115 @@
 void FillerBase::setScanRate(const Vector<Double>& srate)
 {
-
     RecordFieldPtr<Array<Double> > srateCol(row_.record(), "SCANRATE");
     *srateCol = srate;
-
 }
 
@@ -128 +129 @@
                            const Vector<Double>& dir,
                            const Vector<Double>& propermot,
-                          Double velocity)
+                           Double velocity)
 {
     RecordFieldPtr<String> srcnCol(row_.record(), "SRCNAME");
-    *srnCol = name;
+    *srcnCol = name;
     RecordFieldPtr<Int> srctCol(row_.record(), "SRCTYPE");
     *srctCol = type;
@@ -137 +138 @@
     *fieldnCol = fieldname;
     RecordFieldPtr<Array<Double> > spmCol(row_.record(), "SRCPROPERMOTION");
-    *spmCol = pksrec.srcPM;
+    *spmCol = propermot;
     RecordFieldPtr<Array<Double> > sdirCol(row_.record(), "SRCDIRECTION");
-    *sdirCol = pksrec.srcDir;
+    *sdirCol = dir;
     RecordFieldPtr<Double> svelCol(row_.record(), "SRCVELOCITY");
-    *svelCol = pksrec.srcVel;
+    *svelCol = velocity;
 }