From ed094cf611fb75f49f660c174359c006d679473f Mon Sep 17 00:00:00 2001 From: Peter Yoachim Date: Mon, 2 Oct 2023 10:41:52 -0700 Subject: [PATCH 1/2] almanac farther into future --- rubin_sim/site_models/generate_planets.py | 2 +- rubin_sim/site_models/generate_sun_moon_pos.py | 2 +- rubin_sim/site_models/generate_sunsets.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rubin_sim/site_models/generate_planets.py b/rubin_sim/site_models/generate_planets.py index ab88a3ac5..885165da0 100644 --- a/rubin_sim/site_models/generate_planets.py +++ b/rubin_sim/site_models/generate_planets.py @@ -6,7 +6,7 @@ if __name__ == "__main__": mjd_start = 59853.5 - 3.0 * 365.25 - duration = 25.0 * 365.25 + duration = 30.0 * 365.25 pad_around = 40 t_step = 1.0 / 24.0 # Start with 1-hour timesteps. diff --git a/rubin_sim/site_models/generate_sun_moon_pos.py b/rubin_sim/site_models/generate_sun_moon_pos.py index e0c40412b..2e1b49432 100644 --- a/rubin_sim/site_models/generate_sun_moon_pos.py +++ b/rubin_sim/site_models/generate_sun_moon_pos.py @@ -9,7 +9,7 @@ if __name__ == "__main__": mjd_start = 59853.5 - 3.0 * 365.25 - duration = 25.0 * 365.25 + duration = 50.0 * 365.25 pad_around = 40 t_step = 1.0 / 24.0 # Start with 1-hour timesteps. diff --git a/rubin_sim/site_models/generate_sunsets.py b/rubin_sim/site_models/generate_sunsets.py index 1584ae446..00d21e2b2 100644 --- a/rubin_sim/site_models/generate_sunsets.py +++ b/rubin_sim/site_models/generate_sunsets.py @@ -11,7 +11,7 @@ # Trying out the astroplan sunrise/set code. # conda install -c astropy astroplan mjd_start = 59853.5 - 3.0 * 365.25 - duration = 25.0 * 365.25 + duration = 50.0 * 365.25 pad_around = 40 t_step = 0.2 From c99a50edbb7cb42b936f217ea63d9b04520a30b6 Mon Sep 17 00:00:00 2001 From: Peter Yoachim Date: Mon, 2 Oct 2023 10:46:45 -0700 Subject: [PATCH 2/2] update site models --- rubin_sim/data/rs_download_data.py | 2 +- rubin_sim/site_models/generate_planets.py | 2 +- rubin_sim/site_models/generate_sun_moon_pos.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rubin_sim/data/rs_download_data.py b/rubin_sim/data/rs_download_data.py index 7511de3cb..939162d93 100644 --- a/rubin_sim/data/rs_download_data.py +++ b/rubin_sim/data/rs_download_data.py @@ -37,7 +37,7 @@ def data_dict(): "orbits_precompute": "orbits_precompute_2023_05_23.tgz", "scheduler": "scheduler_2023_09_22.tgz", "sim_baseline": "sim_baseline_2023_09_22.tgz", - "site_models": "site_models_2023_03_28.tgz", + "site_models": "site_models_2023_10_02.tgz", "skybrightness": "skybrightness_2023_09_11.tgz", "skybrightness_pre": "skybrightness_pre_2023_09_19.tgz", "throughputs": "throughputs_2023_09_22.tgz", diff --git a/rubin_sim/site_models/generate_planets.py b/rubin_sim/site_models/generate_planets.py index 885165da0..553a40f1d 100644 --- a/rubin_sim/site_models/generate_planets.py +++ b/rubin_sim/site_models/generate_planets.py @@ -1,5 +1,5 @@ import numpy as np -from astropy.coordinates import AltAz, EarthLocation, get_body, solar_system_ephemeris +from astropy.coordinates import EarthLocation, get_body, solar_system_ephemeris from astropy.time import Time from rubin_sim.utils import Site diff --git a/rubin_sim/site_models/generate_sun_moon_pos.py b/rubin_sim/site_models/generate_sun_moon_pos.py index 2e1b49432..442446d24 100644 --- a/rubin_sim/site_models/generate_sun_moon_pos.py +++ b/rubin_sim/site_models/generate_sun_moon_pos.py @@ -1,4 +1,3 @@ -import astropy.units as u import numpy as np from astropy.coordinates import AltAz, EarthLocation, get_body, get_sun from astropy.time import Time