Observation current_exp change #668

wtgee · 2018-10-03T05:19:28Z

Changed to current_exp_num to be more consistent.

This is now just a count of the exposure_list, which means we don't need to do specific bookkeeping.

Adds a change to actually reset exposure_list when reset is called.

This is now just a count of the `exposure_list`, which means we don't need to do specific bookkeeping. Adds a change to actually reset `exposure_list` when `reset` is called.

…nt_exp-from-list

AnthonyHorton

Look like good changes, but tests seem to be consistently hanging in test_run_complete (I ran them again to check).

wtgee · 2018-10-04T00:27:09Z

One of those frustrating blocks on test_run_complete. Clearly something is going wrong in the testing but am unable to reproduce locally.

…nt_exp-from-list

wtgee · 2018-10-04T19:34:26Z

This is hanging every time in the test_run_complete, but only when done on travis. I'm tempted to close as there is no clear need for this change but I would like to discover why it is failing. Leaving open for a few days.

jamessynge · 2018-10-05T00:47:11Z

pocs/scheduler/observation.py

@@ -157,10 +164,10 @@ def last_exposure(self):
 ##################################################################################################

    def reset(self):


It would be great if this method were called by __init__, so that they can't get out of sync.

jamessynge · 2018-10-05T00:48:12Z

pocs/scheduler/observation.py

@@ -127,6 +125,15 @@ def directory(self):
                                           self.field.field_name)
            return self._directory

+    @property
+    def current_exp_num(self):


What if we're currently taking another exposure? Is that counted or not?

This value will go up inside the camera.take_observation method but before the call to take_exposure. So yes, the current_exp_num will reflect an image in the process of being taken.

pocs/scheduler/observation.py

jamessynge · 2018-10-05T00:50:16Z

pocs/state/states/default/observing.py

@@ -27,7 +27,6 @@ def on_enter(event_data):
        pocs.logger.warning("Problem with imaging: {}".format(e))
        pocs.say("Hmm, I'm not sure what happened with that exposure.")
    else:
-        pocs.observatory.current_observation.current_exp += 1
        pocs.logger.debug('Finished with observing, going to analyze')



Drop the blank line?

…nt_exp-from-list

wtgee · 2018-10-05T04:30:32Z

This is hanging every time in the test_run_complete, but only when done on travis. I'm tempted to close as there is no clear need for this change but I would like to discover why it is failing. Leaving open for a few days.

The hang here is coming from the camera simulator trying to use the same image each time. On my local I now get:

D1005 04:26:48.701 Taking 2.0 second exposure on Cam01: /var/panoptes//images/fields/Kic8462852/SC0910/20160909T080000/20160909T080000.fits              
E1005 04:26:50.721 Error writing image to /var/panoptes//images/fields/Kic8462852/SC0550/20160909T080000/20160909T080000.fits!
E1005 04:26:50.721 Error writing image to /var/panoptes//images/fields/Kic8462852/SC0910/20160909T080000/20160909T080000.fits!
E1005 04:26:50.721 File '/var/panoptes//images/fields/Kic8462852/SC0550/20160909T080000/20160909T080000.fits' already exists.
E1005 04:26:50.721 File '/var/panoptes//images/fields/Kic8462852/SC0910/20160909T080000/20160909T080000.fits' already exists.

and it loops forever. Will work on getting a fix for it. Will be somewhat related to other camera tests.

jamessynge · 2018-10-05T19:48:04Z

Regarding test_run_complete, I can't help but note the // (double slash) in the paths. Fixing that probably won't help... but might!

wtgee · 2018-10-05T19:49:51Z

Regarding test_run_complete, I can't help but note the // (double slash) in the paths. Fixing that probably won't help... but might!

Both you and @AnthonyHorton pointed it out so I would be a fool to ignore fixing it! Edit: #680

…nt_exp-from-list

wtgee · 2018-10-06T04:24:00Z

These tests will clear after #681 and #684 are merged.

…nt_exp-from-list

If image upload fails give an error in logs but don't otherwise stop

…nt_exp-from-list

codecov · 2018-10-10T05:25:14Z

Codecov Report

Merging #668 into develop will decrease coverage by 0.22%.
The diff coverage is 96.29%.

@@             Coverage Diff             @@
##           develop     #668      +/-   ##
===========================================
- Coverage    77.92%   77.69%   -0.23%     
===========================================
  Files           61       61              
  Lines         5069     5080      +11     
  Branches       695      697       +2     
===========================================
- Hits          3950     3947       -3     
- Misses         910      921      +11     
- Partials       209      212       +3

Impacted Files	Coverage Δ
pocs/state/states/default/observing.py	`72.22% <ø> (-1.47%)`	⬇️
pocs/camera/simulator.py	`98.21% <ø> (-0.04%)`	⬇️
pocs/observatory.py	`89.49% <100%> (-0.29%)`	⬇️
pocs/camera/camera.py	`91.14% <100%> (+1.84%)`	⬆️
pocs/state/states/default/pointing.py	`64.7% <100%> (ø)`	⬆️
pocs/scheduler/observation.py	`94.73% <100%> (+0.53%)`	⬆️
pocs/state/states/default/analyzing.py	`56.25% <66.66%> (ø)`	⬆️
pocs/utils/images/__init__.py	`60.3% <0%> (-5.53%)`	⬇️
pocs/utils/images/fits.py	`81.31% <0%> (-2.03%)`	⬇️
pocs/dome/astrohaven.py	`71.05% <0%> (-1.76%)`	⬇️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c31266a...cba763d. Read the comment docs.

Observation current_exp change

41c8544

This is now just a count of the `exposure_list`, which means we don't need to do specific bookkeeping. Adds a change to actually reset `exposure_list` when `reset` is called.

wtgee added the Quick PR This PR should be quick to review. label Oct 3, 2018

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

79d2dd4

…nt_exp-from-list

AnthonyHorton reviewed Oct 3, 2018

View reviewed changes

wtgee added 2 commits October 4, 2018 10:33

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

6bce61b

…nt_exp-from-list

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

599b985

…nt_exp-from-list

jamessynge approved these changes Oct 5, 2018

View reviewed changes

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

54d1c3f

…nt_exp-from-list

Some work on the filename for camera simulator

458e8e6

wtgee added 3 commits October 6, 2018 05:50

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

f88c941

…nt_exp-from-list

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

e435071

…nt_exp-from-list

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

1eefb5c

…nt_exp-from-list

wtgee added 3 commits October 6, 2018 16:29

Adding a small addition to dome test to try and force coverage

a8f1a8b

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

cf0844d

…nt_exp-from-list

Fixing change from merge

a8ce53c

If image upload fails give an error in logs but don't otherwise stop

wtgee removed the Quick PR This PR should be quick to review. label Oct 6, 2018

wtgee added 8 commits October 7, 2018 06:53

Fixing directory test after panoptes#680 (not sure why failing here)

a500ee5

Add primary image identifier to camera string

8f69364

Remov

8f8f2d2

Add a random number of seconds to a set POCSTIME

b7abb8f

Add some random seconds to the POCSTIME. Helps with many filename issues

87a8ff1

Changing moon values for this test. Not sure why needed

2179bf3

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

ab0d6c4

…nt_exp-from-list

Remove random seconds from current_time

90296ac

wtgee added 3 commits October 10, 2018 15:19

Skip exception for coverage

9b723d6

Merge branch 'develop' of https://github.com/panoptes/POCS into curre…

ac47678

…nt_exp-from-list

Reset observation at start so always in sync

30fb42d

wtgee added 6 commits October 10, 2018 17:02

Deal with pointing images in a smarter fashion

79ae630

Don't try to assign pointing image.

620f10b

Store solved image object for pointing

e2f0e61

Properly get the pointing image

6bb3e8b

Test for lack of pointing image

9cb3da2

Properly fetch the pointing image

cba763d

wtgee merged commit 268110a into panoptes:develop Oct 10, 2018

wtgee deleted the current_exp-from-list branch October 10, 2018 10:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Observation current_exp change #668

Observation current_exp change #668

wtgee commented Oct 3, 2018

AnthonyHorton left a comment

wtgee commented Oct 4, 2018

wtgee commented Oct 4, 2018

jamessynge Oct 5, 2018

jamessynge Oct 5, 2018

wtgee Oct 5, 2018

jamessynge Oct 5, 2018

wtgee commented Oct 5, 2018

jamessynge commented Oct 5, 2018

wtgee commented Oct 5, 2018 •

edited

Loading

wtgee commented Oct 6, 2018 •

edited

Loading

codecov bot commented Oct 10, 2018 •

edited

Loading

		@@ -157,10 +164,10 @@ def last_exposure(self):
		##################################################################################################

		def reset(self):

Observation current_exp change #668

Observation current_exp change #668

Conversation

wtgee commented Oct 3, 2018

AnthonyHorton left a comment

Choose a reason for hiding this comment

wtgee commented Oct 4, 2018

wtgee commented Oct 4, 2018

jamessynge Oct 5, 2018

Choose a reason for hiding this comment

jamessynge Oct 5, 2018

Choose a reason for hiding this comment

wtgee Oct 5, 2018

Choose a reason for hiding this comment

jamessynge Oct 5, 2018

Choose a reason for hiding this comment

wtgee commented Oct 5, 2018

jamessynge commented Oct 5, 2018

wtgee commented Oct 5, 2018 • edited Loading

wtgee commented Oct 6, 2018 • edited Loading

codecov bot commented Oct 10, 2018 • edited Loading

Codecov Report

wtgee commented Oct 5, 2018 •

edited

Loading

wtgee commented Oct 6, 2018 •

edited

Loading

codecov bot commented Oct 10, 2018 •

edited

Loading