Changes in trunk/test/test_scantable.py [1925:1844]

File:

• trunk/test/test_scantable.py (modified) (4 diffs)

trunk/test/test_scantable.py

@@ -3 +3 @@
 import shutil
 import datetime
-from nose.tools import *
 from asap import scantable, selector, mask_not
 from asap.logging import asaplog
-# no need for log messages
 asaplog.disable()
+
+from nose.tools import *
 
 def tempdir_setup():
@@ -72 +72 @@
         sel.set_polarisations("YY")
         self.st.set_selection(sel)
-        assert_equal(self.st.getpolnos(), [1])
+        assert_equal(self.st.getpolnos(), (1,))
         sel1 = self.st.get_selection()
         assert_equal(sel1.get_pols(), [1])
         self.st.set_selection(pols="XX")
-        assert_equal(self.st.getpolnos(), [0])
+        assert_equal(self.st.getpolnos(), (0,))
 
 
@@ -165 +165 @@
     def test_drop_scan(self):
         s0 = self.st.drop_scan(1)
-        assert_equal(s0.getscannos(), [0])
+        assert_equal(s0.getscannos(), (0,))
         s1 = self.st.drop_scan([0])
-        assert_equal(s1.getscannos(), [1])
+        assert_equal(s1.getscannos(), (1,))
 
     def test_flag(self):
@@ -206 +206 @@
             for spec in ds:
                 assert_almost_equals(sum(spec)/len(spec), 0.0, 5)
-
-    def test_auto_poly_baseline(self):
-        q = self.st.auto_quotient()
-        b = q.auto_poly_baseline(insitu=False)
-        res_rms = (q-b).stats('rms')
-        assert_almost_equals(res_rms[0], 0.38370, 5)
-        assert_almost_equals(res_rms[1], 0.38780, 5)        
-        
-
-    def test_poly_baseline(self):
-        q = self.st.auto_quotient()
-        msk = q.create_mask([0.0, 1471.0], [1745.0, 4095.0])
-        b = q.poly_baseline(order=0, mask=msk,insitu=False)
-        res_rms = (q-b).stats('rms')
-        assert_almost_equals(res_rms[0], 0.38346, 5)
-        assert_almost_equals(res_rms[1], 0.38780, 5)