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

Cleanup inconsistency in take_exposure call #457

Merged
merged 1 commit into from
Feb 8, 2018
Merged

Cleanup inconsistency in take_exposure call #457

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pocs/camera/canon_gphoto2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def take_observation(self, observation, headers=None, filename=None, *args, **kw

return camera_event

def take_exposure(self, seconds=1.0 * u.second, filename=None):
def take_exposure(self, seconds=1.0 * u.second, filename=None, *args, **kwargs):
"""Take an exposure for given number of seconds and saves to provided filename

Note:
Expand Down
8 changes: 7 additions & 1 deletion pocs/camera/simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ def take_observation(self, observation, headers=None, filename=None, *args, **kw

return camera_event

def take_exposure(self, seconds=1.0 * u.second, filename=None, dark=False, blocking=False):
def take_exposure(self,
seconds=1.0 * u.second,
filename=None,
dark=False,
blocking=False,
*args,
**kwargs):
""" Take an exposure for given number of seconds """
assert self.is_connected, self.logger.error("Camera must be connected for take_exposure!")

Expand Down