Changeset 1730 for trunk/src

Timestamp:

04/28/10 21:44:09 (15 years ago)

Author:

Malte Marquarding

Message:

Ticket #183: added get_weather to scantable. It returns a dicr or list of dicts

Location:

trunk/src

Files:

• Scantable.cpp (modified) (6 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (2 diffs)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -279 +279 @@
   rbeamCol_.attach(table_, "REFBEAMNO");
 
+  mweatheridCol_.attach(table_,"WEATHER_ID");
   mfitidCol_.attach(table_,"FIT_ID");
   mfreqidCol_.attach(table_, "FREQ_ID");
@@ -434 +435 @@
     Table tab = table_.copyToMemoryTable(generateName());
     tab.deepCopy(inname, Table::New);
+    tab.markForDelete();
+
   } else {
     table_.deepCopy(inname, Table::New);
@@ -1056 +1059 @@
 }
 
-std::string asap::Scantable::getAntennaName() const
+std::string Scantable::getAntennaName() const
 {
   String out;
@@ -1063 +1066 @@
 }
 
-int asap::Scantable::checkScanInfo(const std::vector<int>& scanlist) const
+int Scantable::checkScanInfo(const std::vector<int>& scanlist) const
 {
   String tbpath;
@@ -1131 +1134 @@
 }
 
-std::vector<double>  asap::Scantable::getDirectionVector(int whichrow) const
+std::vector<double> Scantable::getDirectionVector(int whichrow) const
 {
   Vector<Double> Dir = dirCol_(whichrow).getAngle("rad").getValue();
@@ -1139 +1142 @@
 }
 
+std::vector<float> Scantable::getWeather(int whichrow) const
+{
+  std::vector<float> out(5);
+  //Float temperature, pressure, humidity, windspeed, windaz;
+  weatherTable_.getEntry(out[0], out[1], out[2], out[3], out[4],
+                         mweatheridCol_(uInt(whichrow)));
+
+
+  return out;
+}
+
 }
  //namespace asap

trunk/src/Scantable.h

@@ -348 +348 @@
   std::vector<double> getAbcissa(int whichrow) const;
 
+  std::vector<float> getWeather(int whichrow) const;
+
   std::string getAbcissaLabel(int whichrow) const;
   std::vector<double> getRestFrequencies() const

trunk/src/ScantableWrapper.h

@@ -210 +210 @@
     { return table_->checkScanInfo(scanlist); }
 
-  std::vector<double>  getDirectionVector(int whichrow) const
+  std::vector<double> getDirectionVector(int whichrow) const
     { return table_->getDirectionVector(whichrow); }
 
@@ -219 +219 @@
     return STCoordinate(table_->getSpectralCoordinate(row));
   }
+
+  std::vector<float> getWeather(int whichrow) const
+    { return table_->getWeather(whichrow); }
 
 private:

trunk/src/python_Scantable.cpp

@@ -126 +126 @@
     .def("_parallactify", &ScantableWrapper::parallactify)
     .def("get_coordinate", &ScantableWrapper::getCoordinate)
+    .def("_get_weather", &ScantableWrapper::getWeather)
   ;
 };