Commit ebfeb0f8 authored by Laurent Claustre's avatar Laurent Claustre

Merge branch '5-priamacq-false-minimum-period-calculation-in-startacq' into 'master'

Resolve "PriamAcq: wrong minimum period calculation in startAcq()"

Closes #5

See merge request !7
parents 036f4a7b 837639c6
Pipeline #33845 passed with stages
in 6 minutes and 9 seconds
......@@ -5,8 +5,6 @@ c_compiler:
cxx_compiler:
- vs2017 # [win]
python:
- 2.7 # [linux]
- 3.6
- 3.7
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
......
......@@ -18,13 +18,13 @@ build:
requirements:
host:
- python {{ python }}
- numpy
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core
- lima-common-espia
build:
- git
- cmake
- make
- {{ compiler('cxx') }}
run:
- python {{ python }}
......
......@@ -19,6 +19,7 @@ build:
requirements:
build:
- cmake
- make
- git
- lima-core
run:
......
......@@ -764,7 +764,10 @@ void PriamAcq::startAcq()
txtime= m_fo_fast ? 560. : 700.;
txtime /= m_time_us;
minit = m_min_it / m_time_us;
if (m_nb_frame != 1 && (m_int_time-minit+m_expo_time)<(txtime*nbchip))
// do not check timing in external trigger
if (m_trig_mode == IntTrig || m_trig_mode == IntTrigMult)
if (m_nb_frame != 1 && (m_int_time+m_expo_time)<(txtime*nbchip))
THROW_HW_ERROR(Error) << "Timing too fast (interval+expo < transfer): "
<< DEB_VAR5(m_int_time, minit, m_expo_time,
txtime, nbchip);
......
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