Changeset 1773

Timestamp:

07/29/10 17:44:46 (14 years ago)

Author:

Malte Marquarding

Message:

merge from HEAD

Location:

tags/junk

Files:

• . (modified) (1 prop)
• INSTALL (modified) (1 diff)
• python/opacity.py (modified) (3 diffs)

tags/junk/INSTALL

@@ -22 +22 @@
    #
    scons install
-
 
 Obtaining the data directory

tags/junk/python/opacity.py

@@ -45 +45 @@
             elevation:     observatory elevation about sea level (in meters)
         """
-        self._atm = atmosphere(temp, self._to_pascals(pressure), humidity)
+        self._atm = atmosphere(temperature, self._to_pascals(pressure), 
+                               humidity)
         self.set_observatory_elevation(elevation)
 
@@ -96 +97 @@
                         is given (default) the zenith opacity is returned.
         """
-        self._atm.set_observatory_elevation(el)
+        self._atm.set_observatory_elevation(elevation)
 
 
@@ -162 +163 @@
     pnos = scan.getpolnos()
     opacities = []
-    om = opacitymodel(temperature, pressure, humidity)
+    om = model(temperature, pressure, humidity)
     for ino in inos:
         sel.set_ifs(ino)