Commit be002067 authored by ahoms's avatar ahoms
Browse files

* fixed import of processlib.Tasks

* fixed typo when calling getFrameDim
* always perform an Espia resetLink in Frelon::Camera::sync



git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@222 45c4679d-1946-429d-baad-37912b19538b
parent 4afd607b
from TacoCcd import *
from FrelonAcq import FrelonAcq
from processlib.Tasks import BpmManager, BpmTask
from processlib import Tasks
import gc
class FrelonTacoAcq(TacoCcdAcq):
......@@ -13,8 +13,8 @@ class FrelonTacoAcq(TacoCcdAcq):
espia_dev_nb = 0
self.m_acq = FrelonAcq(espia_dev_nb)
self.m_bpm_mgr = BpmManager()
self.m_bpm_task = BpmTask(self.m_bpm_mgr)
self.m_bpm_mgr = Tasks.BpmManager()
self.m_bpm_task = Tasks.BpmTask(self.m_bpm_mgr)
@DEB_MEMBER_FUNCT
def __del__(self):
......@@ -462,7 +462,7 @@ class FrelonTacoAcq(TacoCcdAcq):
exp_time = self.getExpTime()
threshold = 0
calib_intensity = -1
max_frame_dim = self.getFrameDim(max_frame=True)
max_frame_dim = self.getFrameDim(max_dim=True)
roi = self.getRoi()
is_live = -1
......
......@@ -29,6 +29,10 @@ void Camera::sync()
{
DEB_MEMBER_FUNCT();
DEB_TRACE() << "Forcing a link reset";
Espia::Dev& dev = getEspiaDev();
dev.resetLink();
DEB_TRACE() << "Synchronizing with the camera";
string ver;
......@@ -86,8 +90,6 @@ void Camera::readRegister(Reg reg, int& val)
void Camera::hardReset()
{
DEB_MEMBER_FUNCT();
Espia::Dev& dev = getEspiaDev();
dev.resetLink();
DEB_TRACE() << "Reseting the camera";
sendCmd(Reset);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment