Merge pull request #1 from pyobs/develop

v0.8

Author: thusser

Dockerfile

@@ -13,4 +13,4 @@ RUN python setup.py install
 RUN rm -rf /src
 
 # set entrypoint
-ENTRYPOINT ["/usr/local/bin/pyobs", "/pyobs.yaml"]
+ENTRYPOINT ["/usr/local/bin/pyobs"]

pyobs_fli/flicamera.py

@@ -205,7 +205,7 @@ def _expose(self, exposure_time: int, open_shutter: bool, abort_event: threading
         hdu.header['DATAMEAN'] = (float(np.mean(img)), 'Mean data value')
 
         # biassec/trimsec
-        full = self.get_full_frame()
+        full = self._driver.get_visible_frame()
         self.set_biassec_trimsec(hdu.header, *full)
 
         # return FITS image

pyobs_fli/flidriver.pyx

@@ -117,8 +117,8 @@ cdef class FliDriver:
         # return window and binning
         return (hoffset, voffset, width, height), (hbin, vbin)
 
-    def get_full_frame(self):
-        """Returns the full frame of the connected camera.
+    def get_visible_frame(self):
+        """Returns the visible frame of the connected camera.
 
         Returns:
             Tuple with left, top, width, and height of full frame.
@@ -138,6 +138,27 @@ cdef class FliDriver:
         # return it
         return ul_x, ul_y, lr_x -  ul_x, lr_y - ul_y
 
+    def get_full_frame(self):
+        """Returns the full frame of the connected camera.
+
+        Returns:
+            Tuple with left, top, width, and height of full frame.
+
+        Raises:
+            ValueError: If fetching visible area fails.
+        """
+
+        # variables
+        cdef long ul_x, ul_y, lr_x, lr_y
+
+        # get area
+        res = FLIGetArrayArea(self._device, &ul_x, &ul_y, &lr_x, &lr_y)
+        if res != 0:
+            raise ValueError('Could not query total area.')
+
+        # return it
+        return ul_x, ul_y, lr_x -  ul_x, lr_y - ul_y
+
     def set_binning(self, x: int, y: int):
         """Set the binning.
 

requirements.txt

@@ -1,2 +1 @@
-astropy
-numpy
+.

setup.py

@@ -1,4 +1,4 @@
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import os
 import numpy
 from Cython.Build import cythonize
@@ -19,8 +19,16 @@
 ]
 
 # setup
-setup(name='pyobs_fli',
-      version='0.2',
-      description='pyobs component for FLI cameras',
-      packages=['pyobs_fli'],
-      ext_modules=cythonize(extensions))
+setup(
+    name='pyobs-fli',
+    version='0.8',
+    description='pyobs component for FLI cameras',
+    packages=['pyobs_fli'],
+    ext_modules=cythonize(extensions),
+    install_requires=[
+        'cython',
+        'numpy',
+        'astropy',
+        'pyobs-core'
+    ]
+)