Changeset 1730 for trunk

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

Files:

• doc/CHANGELOG (modified) (2 diffs)
• python/scantable.py (modified) (4 diffs)
• src/Scantable.cpp (modified) (6 diffs)
• src/Scantable.h (modified) (1 diff)
• src/ScantableWrapper.h (modified) (2 diffs)
• src/python_Scantable.cpp (modified) (1 diff)

trunk/doc/CHANGELOG

@@ -4 +4 @@
 Release 3.0.0 [2010-04-??]
 
+* Ticket #183 Added scantable.get_weather
+* Ticket #181 Added work-around for casacore bug in saving tables with selection
+* Ticket #178 Added opacity_model based on  miriad's atmospheric model
 * Ticket #177 Added function skydip to determine opacities.
 * Ticket #172 Fixed non-working scantable.resample
@@ -21 +24 @@
               scantable.get_coordinate
 * Added OS X 10.5 Disk image installer
+* Added support for OS X 10.6
 * Interactive plotting annotations via optional argument interactive=True
 * Interactive creation of masks on the plotter - plotter.create_mask

trunk/python/scantable.py

@@ -417 +417 @@
         return list(Scantable.get_column_names(self))
 
-    def get_tsys(self):
+    def get_tsys(self, row=-1):
         """
         Return the System temperatures.
@@ -423 +423 @@
             a list of Tsys values for the current selection
         """
-
+        if row > -1:
+            return self._get_column(self._gettsys, row)
         return self._row_callback(self._gettsys, "Tsys")
+
+
+    def get_weather(self, row=-1):
+        values = self._get_column(self._get_weather, row)
+        if row > -1:
+            return {'temperature': values[0],
+                    'pressure': values[1], 'humidity' : values[2],
+                    'windspeed' : values[3], 'windaz' : values[4]
+                    }
+        else:
+            out = []
+            for r in values:
+
+                out.append({'temperature': r[0],
+                            'pressure': r[1], 'humidity' : r[2],
+                            'windspeed' : r[3], 'windaz' : r[4]
+                    })
+            return out
 
     def _row_callback(self, callback, label):
@@ -455 +474 @@
             return [callback(i) for i in range(self.nrow())]
         else:
-            if  0 <= row < self.nrow():
+            if 0 <= row < self.nrow():
                 return callback(row)
 
@@ -559 +578 @@
         return self._get_column(self._getdirectionvec, row)
 
-
+    @print_log_dec
     def set_unit(self, unit='channel'):
         """

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)
   ;
 };