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

Default to rereading the fields file #488

Merged
merged 9 commits into from
Apr 12, 2018
Merged

Default to rereading the fields file #488

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d0720c
Default to rereading the fields file
wtgee Feb 16, 2018
cb5ca68
Default the reread to false but set to true in scheduling state.
wtgee Feb 16, 2018
951975d
Don't hard-code the option in the `scheduling` state but instead pull
wtgee Feb 18, 2018
8ada23f
Testing default to False
wtgee Feb 19, 2018
5405498
Moving the reread file check to base scheduler and some cleanup
wtgee Feb 19, 2018
ec7ce31
Reverting file
wtgee Feb 20, 2018
429cedb
Merge branch 'develop' of https://github.com/panoptes/POCS into defau…
wtgee Apr 3, 2018
6ca3aaa
Instead of an error on duplicate field name we just clobber the existing
wtgee Apr 3, 2018
05f2017
Fix for duplicate observation test
wtgee Apr 3, 2018
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
2 changes: 2 additions & 0 deletions pocs/scheduler/dispatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ def get_observation(self, time=None, show_all=False, reread_fields_file=False):
defaults to time called
show_all (bool, optional): Return all valid observations along with
merit value, defaults to False to only get top value
reread_fields_file (bool, optional): If the fields file should be reread
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And the reason for not making the change here in the params list (i.e. default =True).

before scheduling occurs, defaults to False.

Returns:
tuple or list: A tuple (or list of tuples) with name and score of ranked observations
Expand Down
2 changes: 1 addition & 1 deletion pocs/state/states/default/scheduling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def on_enter(event_data):

# Get the next observation
try:
observation = pocs.observatory.get_observation()
observation = pocs.observatory.get_observation(reread_fields_file=True)
pocs.logger.info("Observation: {}".format(observation))
except error.NoObservation as e:
pocs.say("No valid observations found. Can't schedule. Going to park.")
Expand Down