From 7bde337d58180fba8ee64c8f26f22af713447548 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 19 Nov 2019 18:19:54 +0100 Subject: [PATCH] minor: changed interrupted acq help (clearbusy), gui look in mythen3 developer tab --- slsDetectorGui/forms/form_tab_developer.ui | 18 ++++++++++++++++++ slsDetectorSoftware/src/multiSlsDetector.cpp | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/slsDetectorGui/forms/form_tab_developer.ui b/slsDetectorGui/forms/form_tab_developer.ui index 805c252e8..d93fd43c6 100755 --- a/slsDetectorGui/forms/form_tab_developer.ui +++ b/slsDetectorGui/forms/form_tab_developer.ui @@ -53,6 +53,12 @@ 0 + + + 0 + 28 + + @@ -95,6 +101,12 @@ 0 + + + 0 + 28 + + <html><head/><body><p>High Voltage</p><p> #vhighvoltage#</p></body></html> @@ -159,6 +171,12 @@ 0 + + + 0 + 28 + + <html><head/><body><p>High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.</p><p>-1 corresponds to different values from detectors.</p><p>#vhighvoltage#</p></body></html> diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp index 67d25a92a..be7fbcb01 100755 --- a/slsDetectorSoftware/src/multiSlsDetector.cpp +++ b/slsDetectorSoftware/src/multiSlsDetector.cpp @@ -276,7 +276,7 @@ bool multiSlsDetector::isAcquireReady() { FILE_LOG(logWARNING) << "Acquire has already started. " "If previous acquisition terminated unexpectedly, " - "reset busy flag to restart.(sls_detector_put busy 0)"; + "reset busy flag to restart.(sls_detector_put clearbusy)"; return false; } multi_shm()->acquiringFlag = true;