Skip to content

shift start of cadence to observation time #1498

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

Open
jchate6 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

shift start of cadence to observation time #1498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion tom_observations/cadences/resume_cadence_after_failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ def run(self):
# Boilerplate to get necessary properties for future calls
start_keyword, end_keyword = facility.get_start_end_keywords()
observation_payload = last_obs.parameters
observation_payload['last_obs_end'] = last_obs.scheduled_end
observation_payload['last_obs_start'] = last_obs.scheduled_start

# Cadence logic
# If the observation hasn't finished, do nothing
Expand Down Expand Up @@ -105,7 +107,14 @@ def advance_window(self, observation_payload, start_keyword='start', end_keyword
advance_window_hours = cadence_frequency
window_length = parse(observation_payload[end_keyword]) - parse(observation_payload[start_keyword])

new_start = parse(observation_payload[start_keyword]) + timedelta(hours=advance_window_hours)
# If the last observation has an end or start time recorded use that for the beginning of the new cadence
# Otherwise use the start time of the current cadence.
if observation_payload['last_obs_end']:
new_start = observation_payload['last_obs_end'] + timedelta(hours=advance_window_hours)
elif observation_payload['last_obs_start']:
new_start = observation_payload['last_obs_start'] + timedelta(hours=advance_window_hours)
else:
new_start = parse(observation_payload[start_keyword]) + timedelta(hours=advance_window_hours)
if new_start < datetime.now(): # Ensure that the new window isn't in the past
new_start = datetime.now()
new_end = new_start + window_length
Expand Down
Loading