Changeset 1824 for trunk/test

Timestamp:

08/02/10 19:40:09 (14 years ago)

Author:

Malte Marquarding

Message:

Refactoring of init.py. Moved functionality into separate modules. Some minor fixes to make unit test work under 'standard asap'.

File:

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

trunk/test/test_scantable.py

@@ -1 +1 @@
 import unittest
 import datetime
-from asap import scantable, selector, rcParams, mask_not
-rcParams["verbose"] = False
+from asap import scantable, selector, rcParams, mask_not, asaplog
+asaplog.disable()
 
 class ScantableTest(unittest.TestCase):
     def setUp(self):
-
-        self.st = scantable("data/MOPS.rpf", average=True)
+        s = scantable("data/MOPS.rpf", average=True)
+        sel = selector()
+        # make sure this order is always correct - in can be random
+        sel.set_order(["SCANNO", "POLNO"])
+        s.set_selection(sel)
+        self.st = s.copy()
         restfreqs = [86.243]     # 13CO-1/0, SiO the two IF
         self.st.set_restfreqs(restfreqs,"GHz")
@@ -78 +82 @@
     def test_get_column_names(self):
         cnames = ['SCANNO', 'CYCLENO', 'BEAMNO', 'IFNO',
-                  'POLNO', 'FREQ_ID', 'MOLECULE_ID', 'REFBEAMNO',
+                  'POLNO', 'FREQ_ID', 'MOLECULE_ID', 'REFBEAMNO', 'FLAGROW',
                   'TIME', 'INTERVAL', 'SRCNAME', 'SRCTYPE',
                   'FIELDNAME', 'SPECTRA', 'FLAGTRA', 'TSYS',
@@ -101 +105 @@
     def test_get_sourcename(self):
         self.assertEqual(self.st.get_sourcename(0), 'Orion_SiO_R')
-        self.assertEqual(self.st.get_sourcename()[:2], ['Orion_SiO_R', 'Orion_SiO'])
+        self.assertEqual(self.st.get_sourcename(),
+                         ['Orion_SiO_R', 'Orion_SiO_R',
+                          'Orion_SiO', 'Orion_SiO'])
 
     def test_get_azimuth(self):
@@ -144 +150 @@
         msk = q0.create_mask([-10,20])
         q0.flag(mask=mask_not(msk))
+        q1.flag(mask=msk)
         self.assertAlmostEqual(q0.stats(stat='max')[0], 95.62171936)
-        q1.flag(mask=msk)
         self.assertAlmostEqual(q1.stats(stat='max')[0], 2.66563416)