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

Only the primary camera should have images saved in list #329

Merged
merged 1 commit into from
Jan 15, 2018
Merged

Only the primary camera should have images saved in list #329

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
3 changes: 2 additions & 1 deletion pocs/camera/canon_gphoto2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ def take_observation(self, observation, headers=None, filename=None, **kwargs):
proc = self.take_exposure(seconds=exp_time, filename=file_path)

# Add most recent exposure to list
observation.exposure_list[image_id] = file_path.replace('.cr2', '.fits')
if self.is_primary:
observation.exposure_list[image_id] = file_path.replace('.cr2', '.fits')
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the point that we're trying to have a single canonical image to represent each exposure, even if we have multiple cameras? I'm not sure I understand why. Perhaps a comment?

Copy link
Member Author

Choose a reason for hiding this comment

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

The exposure list is used for tracking purposes so the closed-loop compares the pointing image to the last_exposure. We always want to compare just the primary camera to itself.

I was going to expand exposure_list so it contained all exposures, which would make the cleanup and uploading to cloud a bit easier. So this might change going forward.

I'll add an explanation.

Copy link
Member Author

Choose a reason for hiding this comment

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

I took the easy out and made #342 for now. I want to make the whole thing more robust.


# Process the image after a set amount of time
wait_time = exp_time + self.readout_time
Expand Down