Changeset 1824 for trunk/python/scantable.py

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/python/scantable.py (modified) (3 diffs)

trunk/python/scantable.py

@@ -5 +5 @@
     from asap.compatibility import wraps as wraps_dec
 
+from asap.env import is_casapy
 from asap._asap import Scantable
-from asap import rcParams
-from asap import print_log, print_log_dec
-from asap import asaplog
-from asap import selector
-from asap import linecatalog
+from asap.parameters import rcParams
+from asap.logging import asaplog, print_log, print_log_dec
+from asap.selector import selector
+from asap.linecatalog import linecatalog
 from asap.coordinate import coordinate
-from asap import _n_bools, mask_not, mask_and, mask_or
+from asap.utils import _n_bools, mask_not, mask_and, mask_or
 
 
@@ -37 +37 @@
 
     @print_log_dec
-    def __init__(self, filename, average=None, unit=None, getpt=None, antenna=None, parallactify=None):
+    def __init__(self, filename, average=None, unit=None, getpt=None,
+                 antenna=None, parallactify=None):
         """
         Create a scantable from a saved one or make a reference
@@ -2399 +2400 @@
         if unit is not None:
             self.set_fluxunit(unit)
-        #self.set_freqframe(rcParams['scantable.freqframe'])
+        if not is_casapy():
+            self.set_freqframe(rcParams['scantable.freqframe'])
 
     def __getitem__(self, key):