From a872eeeb50b38380cf295eca7cb6766df5669fd0 Mon Sep 17 00:00:00 2001
From: Sonia Minolli <sonia.minolli@synchrotron-soleil.fr>
Date: Thu, 21 Jan 2016 10:13:55 +0000
Subject: [PATCH] Created tag release_2_4_0.
---
pom.xml | 2 +-
src/AIManager.cpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ff09b03..1308e6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>AIControllerV2-${aol}-${mode}</artifactId>
- <version>2.3.6-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>nar</packaging>
<name>AIControllerV2</name>
diff --git a/src/AIManager.cpp b/src/AIManager.cpp
index ff9943a..ea6dfc0 100644
--- a/src/AIManager.cpp
+++ b/src/AIManager.cpp
@@ -658,6 +658,12 @@ void AIManager::start()
CHECK_ACQ_REF;
+ // In autotuning mode, re-evaluate sampling frequency (in case not done before by periodic_job)
+ if (this->m_currentAcquisition->getAutoTuning())
+ {
+ this->updateAutoSamplingRate();
+ }
+
// check driver memory before starting acquisition
try
{
--
GitLab