Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-41409: Fix use of pascals in pressure #38

Merged
merged 2 commits into from
Oct 27, 2023
Merged

DM-41409: Fix use of pascals in pressure #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34b8a8b
Divide pressure by 100 if in Pascals
mfisherlevine Oct 27, 2023
b35964d
Add warning if temperature is missing
mfisherlevine Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions python/lsst/atmospec/spectraction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,10 +352,21 @@ def setAdrParameters(self, spectrum, exp):
hourAngle = asCoords.Angle(hourAngle.asDegrees(), unit=u.deg)

weather = vi.getWeather()

_temperature = weather.getAirTemperature()
temperature = _temperature if not np.isnan(_temperature) else 10 # maybe average?
if _temperature is None or np.isnan(_temperature):
self.log.warning("Temperature not set, using nominal value of 10 C")
_temperature = 10 # nominal value
temperature = _temperature

_pressure = weather.getAirPressure()
pressure = _pressure if not np.isnan(_pressure) else 743 # nominal for altitude?
if _pressure is not None and not np.isnan(_pressure):
if _pressure > 10_000:
_pressure /= 100 # convert from Pa to hPa
else:
self.log.warning("Pressure not set, using nominal value of 743 hPa")
_pressure = 743 # nominal for altitude?
pressure = _pressure
_humidity = weather.getHumidity()
humidity = _humidity if not np.isnan(_humidity) else None # not a required param so no default

Expand Down