Changeset 1780 for branches

Timestamp:

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

Author:

Malte Marquarding

Message:

make filler code compile

Location:

branches/newfiller/src

Files:

• FillerBase.cpp (modified) (8 diffs)
• FillerBase.h (modified) (4 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;
 }
 

branches/newfiller/src/FillerBase.h

@@ -27 +27 @@
 // STL
 #include <string>
-#include <vector>
 // AIPS++
 #include <casa/aips.h>
+#include <casa/Utilities/CountedPtr.h>
+#include <casa/Arrays/Vector.h>
+#include <tables/Tables/TableRow.h>
+#include "Scantable.h"
 
 namespace asap
@@ -50 +53 @@
     void commitRow();
     virtual void setHeader(const STHeader& header);
-    virtual void setSpectrum(const casa::Vector<Float>& spectrum,
-                             const casa::Vector<uChar>& flags) ;
-    virtual void setIndex(uInt scanno, uInt cycleno, uInt ifno, uInt polno,
-                          uInt beamno=0);
+    virtual void setSpectrum(const casa::Vector<casa::Float>& spectrum,
+                             const casa::Vector<casa::uChar>& flags) ;
+    virtual void setIndex(casa::uInt scanno, casa::uInt cycleno,
+                          casa::uInt ifno, casa::uInt polno,
+                          casa::uInt beamno=0);
     virtual void setFrequency(casa::Double refpix, casa::Double refval,
                               casa::Double incr);
-    virtual void setMolecule(casa::Double restfreq);
-    virtual void setDirection(const casa::Vector<Double>& dir,
+    virtual void setMolecule(const casa::Vector<casa::Double>& restfreq);
+    virtual void setDirection(const casa::Vector<casa::Double>& dir,
                               casa::Float az=0.0f, casa::Float el=0.0f);
 
     virtual void setFocus(casa::Float pa=0.0f, casa::Float faxis=0.0f,
-                          casa::Float ftan=0.0f, casa::Float frot=0.0f)
+                          casa::Float ftan=0.0f, casa::Float frot=0.0f);
     virtual void setTime(casa::Double mjd, casa::Double integration);
     virtual void setWeather(casa::Float temperature=0.0f,
@@ -69 +73 @@
                             casa::Float windaz=0.0f);
     virtual void setTcal(const casa::String& caltime="",
-                         const casa::Vector<Float>& tcal=casa::Vector<Float>())
-    virtual void setScanRate(const casa::Vector<Double>& srate=casa::Vector<Double>());
-    virtual void setReferenceBeam(Int beamno=-1);
-    virtual void setSource(const std::string& name, Int type,
+                         const casa::Vector<casa::Float>& tcal=casa::Vector<casa::Float>());
+    virtual void setScanRate(const casa::Vector<casa::Double>& srate=casa::Vector<casa::Double>());
+    virtual void setReferenceBeam(casa::Int beamno=-1);
+    virtual void setSource(const std::string& name, casa::Int type,
                            const std::string& fieldname="",
-                           const casa::Vector<Double>& dircasa::Vector<Double>(),
-                           const casa::Vector<Double>& propermot=casa::Vector<Double>(),
-                           Double velocity=0.0);
+                           const casa::Vector<casa::Double>& dir=casa::Vector<casa::Double>(),
+                           const casa::Vector<casa::Double>& propermot=casa::Vector<casa::Double>(),
+                           casa::Double velocity=0.0);
 
   private:
@@ -84 +88 @@
 
     casa::TableRow row_;
-}
+};
 
 
 };
+#endif