Parking cleanups #590
Parking cleanups #590
Conversation
* Cleanup to `parked` state to make it easier to understand * Ctrl-c while pocs_shell is running will finish loop through state machine rather than call park directly on the mount. This allows for housekeeping (including uploading) of observations even when machine is manually killed. Note: in future might be worth adding an option such that when you press Ctrl-c you are prompted for if you want immediate park and shutdown or if should run through states.
| print_warning('POCS interrupted, skipping states and parking') | ||
| self.pocs.observatory.mount.home_and_park() | ||
| self._running = False | ||
| print_warning('POCS interrupted, parking') |
There was a problem hiding this comment.
Perhaps add the TODO here for the behavior you suggested in the PR?
There was a problem hiding this comment.
Would prefer to move to #592 actually. Can make a note.
pocs/state/states/default/parked.py
Outdated
| @@ -4,24 +4,26 @@ def on_enter(event_data): | |||
| pocs = event_data.model | |||
| pocs.say("I'm parked now. Phew.") | |||
pocs/state/states/default/parked.py
Outdated
| pocs.say("Done with retrying loop, going to clean up and sleep!") | ||
| pocs.next_state = 'housekeeping' | ||
| else: | ||
| has_valid_observations = pocs.observatory.scheduler.has_valid_observations |
There was a problem hiding this comment.
Looks like this var is only used in one place.
pocs/state/states/default/parked.py
Outdated
| pocs.say("Done retrying for this run, going to clean up and shut down!") | ||
| pocs.next_state = 'housekeeping' | ||
| else: # This branch will only happen if there is an error causing a shutdown | ||
| if has_valid_observations: |
There was a problem hiding this comment.
I take it that has_valid_observations being True means that those observations could be taken now, so it isn't yet Astronomical dawn, or some such.
There was a problem hiding this comment.
It doesn't capture the logic of whether those observations are observable or not, it just captures whether or not there is even something to try to schedule. This mostly comes into play if targets are removed while running. Not a widely used feature right now in terms of actively adding/removing fields while running.
parkedstate to make it easier to understandmachine rather than call park directly on the mount. This allows for
housekeeping (including uploading) of observations even when machine
is manually killed.
Edit:
Note: in future might be worth adding an option such that when youI think I would prefer to move to #592press Ctrl-c you are prompted for if you want immediate park and shutdown
or if should run through states.