Changeset 1773 for tags/junk


Ignore:
Timestamp:
07/29/10 17:44:46 (14 years ago)
Author:
Malte Marquarding
Message:

merge from HEAD

Location:
tags/junk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tags/junk

  • tags/junk/INSTALL

    r1741 r1773  
    2222   #
    2323   scons install
    24 
    2524
    2625Obtaining the data directory
  • tags/junk/python/opacity.py

    r1726 r1773  
    4545            elevation:     observatory elevation about sea level (in meters)
    4646        """
    47         self._atm = atmosphere(temp, self._to_pascals(pressure), humidity)
     47        self._atm = atmosphere(temperature, self._to_pascals(pressure),
     48                               humidity)
    4849        self.set_observatory_elevation(elevation)
    4950
     
    9697                        is given (default) the zenith opacity is returned.
    9798        """
    98         self._atm.set_observatory_elevation(el)
     99        self._atm.set_observatory_elevation(elevation)
    99100
    100101
     
    162163    pnos = scan.getpolnos()
    163164    opacities = []
    164     om = opacitymodel(temperature, pressure, humidity)
     165    om = model(temperature, pressure, humidity)
    165166    for ino in inos:
    166167        sel.set_ifs(ino)
Note: See TracChangeset for help on using the changeset viewer.