Changeset 2791 for trunk

Timestamp:

03/15/13 14:36:12 (12 years ago)

Author:

Malte Marquarding

Message:

Ticket #289: added anility to set Tsys, both for scalar and vector values

Location:

trunk

Files:

• python/scantable.py (modified) (1 diff)
• src/Scantable.cpp (modified) (2 diffs)
• src/Scantable.h (modified) (1 diff)
• src/ScantableWrapper.h (modified) (1 diff)
• src/python_Scantable.cpp (modified) (1 diff)
• test/test_scantable.py (modified) (1 diff)

trunk/python/scantable.py

@@ -907 +907 @@
         """
         return self._get_column( self._gettsysspectrum, row )
+
+    def set_tsys(self, values, row=-1):
+        """\
+        Set the Tsys value(s) of the given 'row' or the whole scantable 
+        (selection).
+        
+        Parameters:
+
+            values:    a scalar or list (if Tsys is a vector) of Tsys value(s)
+            row:       the row number to apply Tsys values to. 
+                       (default all rows)
+                       
+        """
+            
+        if not hasattr(values, "__len__"):
+            values = [values]
+        self._settsys(values, row)
 
     def get_weather(self, row=-1):

trunk/src/Scantable.cpp

@@ -5 +5 @@
 //
 //
-// Author: Malte Marquarding <asap@atnf.csiro.au>, (C) 2005
+// Author: Malte Marquarding <asap@atnf.csiro.au>, (C) 2005-2013
 //
 // Copyright: See COPYING file that comes with this distribution
@@ -5168 +5168 @@
 }
 
+void Scantable::setTsys(const std::vector<float>& newvals, int whichrow) {
+  Vector<Float> tsys(newvals);
+  if (whichrow > -1) {
+    if (tsysCol_.shape(whichrow) != tsys.shape())
+      throw(AipsError("Given Tsys values are not of the same shape"));
+    tsysCol_.put(whichrow, tsys);
+  } else {
+    tsysCol_.fillColumn(tsys);
+  }
+}
+
 vector<float> Scantable::getTsysSpectrum( int whichrow ) const
 {

trunk/src/Scantable.h

@@ -342 +342 @@
     { return casa::Vector<casa::Float>(tsysCol_(whichrow))(0); }
   std::vector<float> getTsysSpectrum(int whichrow) const ;
+  
+  void setTsys(const std::vector<float>& newvals, int whichrow);
+
   float getElevation(int whichrow) const
     { return elCol_(whichrow); }

trunk/src/ScantableWrapper.h

@@ -93 +93 @@
     { return table_->getTsysSpectrum(whichrow); }
 
+  void setTsys(const std::vector<float>& newvals, int whichrow=-1)
+  { return table_->setTsys(newvals, whichrow); }
+
   //std::string getTime(int whichrow=0) const
   //  { return table_->getTime(whichrow); }

trunk/src/python_Scantable.cpp

@@ -94 +94 @@
     .def("_gettsys", &ScantableWrapper::getTsys)
     .def("_gettsysspectrum", &ScantableWrapper::getTsysSpectrum )
+    .def("_settsys", &ScantableWrapper::setTsys)
     .def("_getsourcename", &ScantableWrapper::getSourceName,
          (boost::python::arg("whichrow")=0) )

trunk/test/test_scantable.py

@@ -120 +120 @@
     def test_get_tsys(self):
         assert_almost_equal(self.st.get_tsys()[0], 175.830429077)
+
+    def test_set_tsys(self):
+        s = self.st.copy()
+        newval = 100.0
+        s.set_tsys(newval, 0)
+        assert_almost_equal(s.get_tsys()[0], newval)
+        s2 = self.st.copy()
+        s2.set_tsys(newval)
+        out = s2.get_tsys()
+        for i in xrange(len(out)):
+            assert_almost_equal(out[i], newval)
 
     def test_get_time(self):