Minor camera bugfixes

Author: AlexShkarin

pylablib/devices/Andor/AndorSDK2.py

@@ -243,7 +243,8 @@ def close(self):
         """Close connection to the camera"""
         if self.handle is not None:
             try:
-                self.clear_acquisition()
+                if self._opid is not None:
+                    self.clear_acquisition()
                 try:
                     self._select_camera()
                 except AndorError:

pylablib/devices/BitFlow/BitFlow.py

@@ -269,7 +269,7 @@ def setup_acquisition(self, mode="sequence", nframes=100, frame_merge=1):  # pyl
         """
         self.clear_acquisition()
         self._set_frame_merge(frame_merge)
-        nframes=max(nframes,2)
+        nframes=max(nframes,2*self._frame_merge)
         nframes=(((nframes-1)//self._frame_merge)+1)*self._frame_merge
         super().setup_acquisition(mode=mode,nframes=nframes,frame_merge=frame_merge)
         self._acq.BufferSetup(nframes//self._frame_merge)

pylablib/devices/PCO/SC2.py

@@ -734,7 +734,7 @@ def _read_frames(self, rng, return_info=False):
             chunks=[(rng[0],start,l0),(rng[0]+l0,0,stop-start-l0)]
         frames=[self._parse_frames_data(self._buffer_mgr.get_buffer_ptr(s),l,shape) for (_,s,l) in chunks]
         if self._status_line_enabled and frames and len(frames[-1]):
-            self._buffer_overruns=max(self._buffer_overruns,get_status_line(frames[-1][-1,:,:]).framestamp-rng[-1]-1)
+            self._buffer_overruns=max(self._buffer_overruns,get_status_lines(frames[-1][-1,:,:])[0]-rng[-1]-1)
         return frames,None
 
     def _get_grab_acquisition_parameters(self, nframes, buff_size):
@@ -800,7 +800,7 @@ def get_status_line(frame):
 
     Assume that the status line is present; if it isn't, the returned frame info will be a random noise.
     """
-    warnings.warn(DeprecationWarning("PCO.get_status_line will be removed soon; use PCO.get_status_lines instead"))
+    warnings.warn(DeprecationWarning("PCO.get_status_line is deprecated and will be removed in a future version. Use PCO.get_status_lines instead"))
     if frame.ndim==3:
         return [get_status_line(f) for f in frame]
     sline=frame[0,:14]

pylablib/devices/PCO/__init__.py

@@ -1,4 +1,4 @@
 from . import SC2
 from .SC2 import list_cameras, get_cameras_number, PCOSC2Camera
 from .SC2 import PCOSC2Error, PCOSC2TimeoutError, PCOSC2NotSupportedError
-from .SC2 import get_status_line, StatusLineChecker
+from .SC2 import get_status_line, get_status_lines, StatusLineChecker

pylablib/devices/PhotonFocus/PhotonFocus.py

@@ -435,11 +435,11 @@ def get_roi_limits(self, hbin=1, vbin=1): # pylint: disable=unused-argument
 
     def _get_buffer_bpp(self):
         bpp=self.GrabberClass._get_buffer_bpp(self) if self.GrabberClass else 1
-        ppbpp=self._get_camera_bytepp()
+        ppbpp=self._get_camera_bitpp()
         if ppbpp is not None:
             bpp=(ppbpp-1)//8+1
         return bpp
-    def _get_camera_bytepp(self):
+    def _get_camera_bitpp(self):
         fmt=self.get_attribute_value("DataResolution",error_on_missing=False)
         if fmt is None:
             return None
@@ -552,7 +552,7 @@ def open(self):
 
     def _ensure_pixel_format(self):
         fgbpp=self.get_grabber_attribute_value("BITSPERPIXEL")
-        ppbpp=self._get_camera_bytepp()
+        ppbpp=self._get_camera_bitpp()
         if ppbpp is not None and ppbpp!=fgbpp:
             msg=(   "PhotonFocus pixel format {} does not agree with the frame grabber {} bits per pixel; "
                     "changing PhotonFocus pixel format accordingly; to use the original format, alter the camera file".format(self.cav["DataResolution"],fgbpp))
@@ -584,7 +584,7 @@ def open(self):
         self._ensure_pixel_format()
 
     def _ensure_pixel_format(self):
-        ppbpp=self._get_camera_bytepp()
+        ppbpp=self._get_camera_bitpp()
         if ppbpp is not None:
             self.setup_camlink_pixel_format(ppbpp,2)
 
@@ -622,12 +622,9 @@ def setup_acquisition(self, mode="sequence", nframes=100, frame_merge=None):
 
     def _ensure_pixel_format(self):
         fgbpp=self._get_board_info("bpp")
-        ppbpp=self._get_camera_bytepp()
+        ppbpp=self._get_camera_bitpp()
         if ppbpp is not None and ppbpp!=fgbpp:
-            msg=(   "PhotonFocus pixel format {} does not agree with the frame grabber {} bits per pixel; "
-                    "changing PhotonFocus pixel format accordingly; to use the original format, alter the camera file".format(self.cav["DataResolution"],fgbpp))
-            warnings.warn(msg)
-            self._set_camera_bytepp(fgbpp)
+            self._change_board_parameters(bpp=ppbpp)
 
 
 

pylablib/devices/Thorlabs/TLCamera.py

@@ -300,8 +300,9 @@ def acquisition_in_progress(self):
 
     ### Image settings and transfer controls ###
     def get_detector_size(self):
-        width=lib.tl_camera_get_image_width_range(self.handle)[1]
-        height=lib.tl_camera_get_image_height_range(self.handle)[1]
+        roi_range=lib.tl_camera_get_roi_range(self.handle)
+        width=roi_range[6]+1
+        height=roi_range[7]+1
         return width,height
     def get_roi(self):
         roi=lib.tl_camera_get_roi(self.handle)
@@ -328,8 +329,9 @@ def set_roi(self, hstart=0, hend=None, vstart=0, vend=None, hbin=1, vbin=1):
         return self.get_roi()
     def get_roi_limits(self, hbin=1, vbin=1):
         wdet,hdet=self.get_detector_size()
-        hmin=lib.tl_camera_get_image_width_range(self.handle)[0]
-        vmin=lib.tl_camera_get_image_height_range(self.handle)[0]
+        roi_range=lib.tl_camera_get_roi_range(self.handle)
+        hmin=roi_range[2]+1
+        vmin=roi_range[3]+1
         mhbin=lib.tl_camera_get_binx_range(self.handle)[1]
         mvbin=lib.tl_camera_get_biny_range(self.handle)[1]
         hlim=camera.TAxisROILimit(hmin*hbin,wdet,1,hbin,mhbin)

pylablib/devices/utils/load_lib.py

@@ -238,6 +238,8 @@ def close(self, opid):
         Return tuple ``(close_result, uninit_result)`` with the results of the closing and the shutdown.
         If library does not need to be shut down yet, set ``uninit_result=None``
         """
+        if opid is None:
+            return
         with self.lock:
             if opid in self.opened:
                 self.opened.remove(opid)
@@ -261,8 +263,7 @@ def temp_open(self):
             init_result,open_result,opid=self.open()
             yield init_result,open_result
         finally:
-            if opid is not None:
-                self.close(opid)
+            self.close(opid)
     def shutdown(self):
         """Close all opened connections and shutdown the library"""
         for opid in list(self.opened):