diff --git a/.yamlfmt.yml b/.yamlfmt.yml
new file mode 100644
index 0000000..d1f227d
--- /dev/null
+++ b/.yamlfmt.yml
@@ -0,0 +1,2 @@
+formatter:
+ indentless_arrays: true
diff --git a/qt/A_BD_ServiceManager.ui b/qt/A_BD_ServiceManager.ui
index 9f33813..329f51a 100644
--- a/qt/A_BD_ServiceManager.ui
+++ b/qt/A_BD_ServiceManager.ui
@@ -7,7 +7,7 @@
0
0
1320
- 630
+ 595
@@ -115,7 +115,7 @@ caLabel[statusTip="Operation"]{
0
146
1320
- 485
+ 450
@@ -134,7 +134,7 @@ caLabel[statusTip="Operation"]{
0
0
1319
- 455
+ 420
@@ -144,7 +144,7 @@ caLabel[statusTip="Operation"]{
A_BD_ServiceManager_inc.ui
- 13
+ 12
true
@@ -1322,4 +1322,4 @@ caLabel[statusTip="Operation"]{
-
+
\ No newline at end of file
diff --git a/services/master/current/app/config/hla_names.yml b/services/master/current/app/config/hla_names.yml
index c13463b..6266f93 100644
--- a/services/master/current/app/config/hla_names.yml
+++ b/services/master/current/app/config/hla_names.yml
@@ -26,4 +26,3 @@ hla_apps:
- OPTICSFF-X10S
- OPTICSFF-X11M
- OPTICSFF-X12S
-- NTURNS
diff --git a/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs b/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
index 7b7d71c..1b4da99 100644
--- a/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
+++ b/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
@@ -29,5 +29,4 @@ file MASTER.template {
{ "{{ agebd_env }}", "OPTICSFF-X10S" , "0", "0" } # PXII
{ "{{ agebd_env }}", "OPTICSFF-X11M" , "0", "0" } # SIM
{ "{{ agebd_env }}", "OPTICSFF-X12S" , "0", "0" } # cSAXS
- { "{{ agebd_env }}", "NTURNS" , "0", "0" }
}
diff --git a/services/nturns/current/qt/A_BD_NTurns.ui b/services/nturns/current/qt/A_BD_NTurns.ui
index 05f2a6b..1f3dc93 100644
--- a/services/nturns/current/qt/A_BD_NTurns.ui
+++ b/services/nturns/current/qt/A_BD_NTurns.ui
@@ -6,98 +6,675 @@
0
0
- 800
- 600
+ 705
+ 813
MainWindow
-
+
- 0
- 60
- 100
- 50
+ 190
+ 10
+ 341
+ 65
-
+
+ AGEBD-ALH:NTURNS-ONOFF
+
+
+ caChoice::Column
+
+
1
-
- 0
-
-
- AGEBD-NTURNS-DEV:AO
-
-
- 9.000000000000000
-
-
- 0.000000000000000
-
-
+
- 0
- 0
- 601
- 22
+ 810
+ 280
+ 70
+ 20
+
+
+
+
+
+
+ 810
+ 220
+ 70
+ 20
- Toggle AGEBD-ALH-DEV:NTURNS-ONOFF
+ Reload
+
+
+ RELOAD
+
+
+ A
- AGEBD-ALH-DEV:NTURNS-ONOFF
+ AGEBD-ALH:NTURNS-GUIRELOAD
+
+
+ caCalc::TriggerZeroToOne
-
+
- 6
- 34
- 401
- 21
+ 10
+ 90
+ 340
+ 30
- 13
+ 16
+ 75
+ true
- Value of AGEBD-NTURNS-DEV:AO
+ TbT data (max 80 turns)
+
+
+ Qt::AlignCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 360
+ 90
+ 340
+ 30
+
+
+
+
+ 16
+ 75
+ true
+
+
+
+ Stage 0 data (max 2k turns)
+
+
+ Qt::AlignCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 10
+ 130
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ NPoints
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 10
+ 170
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ MinHeight
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 10
+ 210
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ MinSep
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 160
+ 130
+ 100
+ 30
+
+
+
+ AGEBD-NTURNS:CONTROL-80-NPOINTS
+
+
+ caLineEdit::User
+
+
+
+
+
+ 160
+ 170
+ 100
+ 30
+
+
+
+ AGEBD-NTURNS:CONTROL-80-MINHEIGHT
+
+
+
+
+
+ 160
+ 210
+ 100
+ 30
+
+
+
+ AGEBD-NTURNS:CONTROL-80-MINSEP
+
+
+
+
+
+ 370
+ 170
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ MinHeight
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 370
+ 210
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ MinSep
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 520
+ 210
+ 100
+ 30
+
+
+
+ AGEBD-NTURNS:CONTROL-2K-MINSEP
+
+
+
+
+
+ 520
+ 170
+ 100
+ 30
+
+
+
+ AGEBD-NTURNS:CONTROL-2K-MINHEIGHT
+
+
+
+
+
+ 520
+ 130
+ 100
+ 30
+
+
+
+ AGEBD-NTURNS:CONTROL-2K-NPOINTS
+
+
+ caLineEdit::User
+
+
+
+
+
+ 370
+ 130
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ NPoints
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 10
+ 250
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ NPeaks
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 160
+ 250
+ 101
+ 30
+
+
+
+ true
+
+
+ Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ AGEBD-NTURNS:STAGE0-Q-80TURNS
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+ 255
+ 255
+ 225
+
+
+
+ caLineEdit::Static
+
+
+ 0
+
+
+ caLineEdit::User
+
+
+ caLineEdit::Channel
+
+
+ 400.000000000000000
+
+
+ 0.000000000000000
+
+
+ caLineEdit::Height
+
+
+ false
+
+
+ caLineEdit::decimal
+
+
+
+
+
+ 520
+ 250
+ 101
+ 30
+
+
+
+ true
+
+
+ Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ AGEBD-NTURNS:STAGE0-Q-2KTURNS
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+ 255
+ 255
+ 225
+
+
+
+ caLineEdit::Static
+
+
+ 0
+
+
+ caLineEdit::User
+
+
+ caLineEdit::Channel
+
+
+ 400.000000000000000
+
+
+ 0.000000000000000
+
+
+ caLineEdit::Height
+
+
+ false
+
+
+ caLineEdit::decimal
+
+
+
+
+
+ 370
+ 250
+ 130
+ 30
+
+
+
+
+ 18
+
+
+
+ NPeaks
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ESimpleLabel::None
+
+
+
+
+
+ 1
+ 300
+ 703
+ 250
+
+
+
+ AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-80TURNS-WF
+
+
+ caCartesianPlot::Lines
+
+
+ caCartesianPlot::NoSymbol
+
+
+
+ 0
+ 85
+ 255
+
+
+
+ AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-80TURNS-PEAKS
+
+
+ caCartesianPlot::Sticks
+
+
+ caCartesianPlot::NoSymbol
+
+
+ caCartesianPlot::PlotNPointsAndStop
+
+
+
+
+
+
+
+
+ caCartesianPlot::ifzero
+
+
+ caCartesianPlot::User
+
+
+ caCartesianPlot::Auto
+
+
+ 0;16384
+
+
+
+
+
+ 1
+ 560
+ 703
+ 250
+
+
+
+ AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-2KTURNS-WF
+
+
+ caCartesianPlot::Lines
+
+
+ caCartesianPlot::NoSymbol
+
+
+
+ 0
+ 85
+ 255
+
+
+
+ AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-80TURNS-PEAKS;
+
+
+ caCartesianPlot::Sticks
+
+
+ ARS01-DBPM-0760:DAQ-PLT0-STG0-Q
+
+
+ caCartesianPlot::User
+
+
+ 0;16384
-
-
- caNumeric
- QFrame
-
+ caChoice
+ QWidget
+
- caToggleButton
- QCheckBox
-
+ caTextEntry
+ caLineEdit
+
+
+
+ caLabel
+ QLabel
+
+
+
+ caLineEdit
+ QLineEdit
+
+
+
+ caCartesianPlot
+ QwtPlot
+
+
+
+ caCalc
+ QLabel
+
+
+
+ wmSignalPropagator
+ QLabel
+
+
+
+ QwtPlot
+ QFrame
+
-
+
+
+ cacalc_2
+ emitSignal(bool)
+ wmsignalpropagator
+ reloadwindow()
+
+
+ 622
+ 266
+
+
+ 608
+ 329
+
+
+
+
+