Changeset 1826 for trunk/python/opacity.py

Timestamp:

08/03/10 11:41:13 (14 years ago)

Author:

Malte Marquarding

Message:

Tidy up of imports (now imported from asap.). Also fixed some whitespace/tab issues

File:

• trunk/python/opacity.py (modified) (2 diffs)

trunk/python/opacity.py

@@ +1 @@
+__all__ = ["model", "skydip"]
 import os
 import math
-from asap import scantable
-from asap import merge
-from asap import fitter
-from asap import selector
-from asap import rcParams
+from asap.scantable import scantable
+from asap.asapmath import merge
+from asap.asapfitter import fitter
+from asap.selector import selector
+from asap.parameters import rcParams
 from asap._asap import atmosphere
 
@@ -45 +46 @@
             elevation:     observatory elevation about sea level (in meters)
         """
-        self._atm = atmosphere(temperature, self._to_pascals(pressure), 
+        self._atm = atmosphere(temperature, self._to_pascals(pressure),
                                humidity)
         self.set_observatory_elevation(elevation)