sls/hla_framework_bd
0
1
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

chore: fix migrating nturns
Add new service / deploy (push) Successful in 28s
Details

Browse Source
This commit is contained in:
Benjamin Labrecque
2026-07-14 09:32:44 +02:00
parent 965d5899f4
commit a74bdd07e4
5 changed files with 636 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.yamlfmt.yml
+2
View File
@@ -0,0 +1,2 @@
formatter:
indentless_arrays: true
qt/A_BD_ServiceManager.ui
+5 -5
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1320</width>
<height>630</height>
<height>595</height>
</rect>
</property>
<property name="windowTitle">
@@ -115,7 +115,7 @@ caLabel[statusTip="Operation"]{
<x>0</x>
<y>146</y>
<width>1320</width>
<height>485</height>
<height>450</height>
</rect>
</property>
<property name="tabPosition">
@@ -134,7 +134,7 @@ caLabel[statusTip="Operation"]{
<x>0</x>
<y>0</y>
<width>1319</width>
<height>455</height>
<height>420</height>
</rect>
</property>
<property name="macro">
@@ -144,7 +144,7 @@ caLabel[statusTip="Operation"]{
<string notr="true">A_BD_ServiceManager_inc.ui</string>
</property>
<property name="numberOfItems" stdset="0">
<number>13</number>
<number>12</number>
</property>
<property name="adjustSizeToContents" stdset="0">
<bool>true</bool>
@@ -1322,4 +1322,4 @@ caLabel[statusTip="Operation"]{
</hints>
</connection>
</connections>
</ui>
</ui>
services/master/current/app/config/hla_names.yml
-1
View File
@@ -26,4 +26,3 @@ hla_apps:
- OPTICSFF-X10S
- OPTICSFF-X11M
- OPTICSFF-X12S
- NTURNS
services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
-1
View File
@@ -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" }
}
services/nturns/current/qt/A_BD_NTurns.ui
+629 -52
View File
@@ -6,98 +6,675 @@
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>600</height>
<width>705</width>
<height>813</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="caNumeric" name="canumeric">
<widget class="caChoice" name="cachoice">
<property name="geometry">
<rect>
<x>0</x>
<y>60</y>
<width>100</width>
<height>50</height>
<x>190</x>
<y>10</y>
<width>341</width>
<height>65</height>
</rect>
</property>
<property name="integerDigits" stdset="0">
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH:NTURNS-ONOFF</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caChoice::Column</enum>
</property>
<property name="endBit">
<number>1</number>
</property>
<property name="decimalDigits" stdset="0">
<number>0</number>
</property>
<property name="channel" stdset="0">
<string>AGEBD-NTURNS-DEV:AO</string>
</property>
<property name="maxValue">
<double>9.000000000000000</double>
</property>
<property name="minValue">
<double>0.000000000000000</double>
</property>
</widget>
<widget class="caToggleButton" name="catogglebutton">
<widget class="wmSignalPropagator" name="wmsignalpropagator">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>601</width>
<height>22</height>
<x>810</x>
<y>280</y>
<width>70</width>
<height>20</height>
</rect>
</property>
</widget>
<widget class="caCalc" name="cacalc_2">
<property name="geometry">
<rect>
<x>810</x>
<y>220</y>
<width>70</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Toggle AGEBD-ALH-DEV:NTURNS-ONOFF</string>
<string>Reload</string>
</property>
<property name="variable">
<string notr="true">RELOAD</string>
</property>
<property name="calc">
<string notr="true">A</string>
</property>
<property name="channel" stdset="0">
<string>AGEBD-ALH-DEV:NTURNS-ONOFF</string>
<string notr="true">AGEBD-ALH:NTURNS-GUIRELOAD</string>
</property>
<property name="eventSignal">
<enum>caCalc::TriggerZeroToOne</enum>
</property>
</widget>
<widget class="QLabel" name="label">
<widget class="caLabel" name="calabel">
<property name="geometry">
<rect>
<x>6</x>
<y>34</y>
<width>401</width>
<height>21</height>
<x>10</x>
<y>90</y>
<width>340</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<pointsize>16</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Value of AGEBD-NTURNS-DEV:AO</string>
<string>TbT data (max 80 turns)</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_2">
<property name="geometry">
<rect>
<x>360</x>
<y>90</y>
<width>340</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Stage 0 data (max 2k turns)</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_3">
<property name="geometry">
<rect>
<x>10</x>
<y>130</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>NPoints</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_4">
<property name="geometry">
<rect>
<x>10</x>
<y>170</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>MinHeight</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_5">
<property name="geometry">
<rect>
<x>10</x>
<y>210</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>MinSep</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caTextEntry" name="catextentry">
<property name="geometry">
<rect>
<x>160</x>
<y>130</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:CONTROL-80-NPOINTS</string>
</property>
<property name="precisionMode">
<enum>caLineEdit::User</enum>
</property>
</widget>
<widget class="caTextEntry" name="catextentry_2">
<property name="geometry">
<rect>
<x>160</x>
<y>170</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:CONTROL-80-MINHEIGHT</string>
</property>
</widget>
<widget class="caTextEntry" name="catextentry_3">
<property name="geometry">
<rect>
<x>160</x>
<y>210</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:CONTROL-80-MINSEP</string>
</property>
</widget>
<widget class="caLabel" name="calabel_6">
<property name="geometry">
<rect>
<x>370</x>
<y>170</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>MinHeight</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_7">
<property name="geometry">
<rect>
<x>370</x>
<y>210</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>MinSep</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caTextEntry" name="catextentry_4">
<property name="geometry">
<rect>
<x>520</x>
<y>210</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:CONTROL-2K-MINSEP</string>
</property>
</widget>
<widget class="caTextEntry" name="catextentry_5">
<property name="geometry">
<rect>
<x>520</x>
<y>170</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:CONTROL-2K-MINHEIGHT</string>
</property>
</widget>
<widget class="caTextEntry" name="catextentry_6">
<property name="geometry">
<rect>
<x>520</x>
<y>130</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:CONTROL-2K-NPOINTS</string>
</property>
<property name="precisionMode">
<enum>caLineEdit::User</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_8">
<property name="geometry">
<rect>
<x>370</x>
<y>130</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>NPoints</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_9">
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>NPeaks</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caLineEdit" name="caLineEdit_26">
<property name="geometry">
<rect>
<x>160</x>
<y>250</y>
<width>101</width>
<height>30</height>
</rect>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:STAGE0-Q-80TURNS</string>
</property>
<property name="foreground">
<color>
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="background">
<color>
<red>255</red>
<green>255</green>
<blue>225</blue>
</color>
</property>
<property name="colorMode">
<enum>caLineEdit::Static</enum>
</property>
<property name="precision">
<number>0</number>
</property>
<property name="precisionMode">
<enum>caLineEdit::User</enum>
</property>
<property name="limitsMode">
<enum>caLineEdit::Channel</enum>
</property>
<property name="maxValue">
<double>400.000000000000000</double>
</property>
<property name="minValue">
<double>0.000000000000000</double>
</property>
<property name="fontScaleMode" stdset="0">
<enum>caLineEdit::Height</enum>
</property>
<property name="unitsEnabled">
<bool>false</bool>
</property>
<property name="formatType">
<enum>caLineEdit::decimal</enum>
</property>
</widget>
<widget class="caLineEdit" name="caLineEdit_27">
<property name="geometry">
<rect>
<x>520</x>
<y>250</y>
<width>101</width>
<height>30</height>
</rect>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-NTURNS:STAGE0-Q-2KTURNS</string>
</property>
<property name="foreground">
<color>
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="background">
<color>
<red>255</red>
<green>255</green>
<blue>225</blue>
</color>
</property>
<property name="colorMode">
<enum>caLineEdit::Static</enum>
</property>
<property name="precision">
<number>0</number>
</property>
<property name="precisionMode">
<enum>caLineEdit::User</enum>
</property>
<property name="limitsMode">
<enum>caLineEdit::Channel</enum>
</property>
<property name="maxValue">
<double>400.000000000000000</double>
</property>
<property name="minValue">
<double>0.000000000000000</double>
</property>
<property name="fontScaleMode" stdset="0">
<enum>caLineEdit::Height</enum>
</property>
<property name="unitsEnabled">
<bool>false</bool>
</property>
<property name="formatType">
<enum>caLineEdit::decimal</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_10">
<property name="geometry">
<rect>
<x>370</x>
<y>250</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>NPeaks</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="fontScaleMode">
<enum>ESimpleLabel::None</enum>
</property>
</widget>
<widget class="caCartesianPlot" name="cacartesianplot">
<property name="geometry">
<rect>
<x>1</x>
<y>300</y>
<width>703</width>
<height>250</height>
</rect>
</property>
<property name="channels_1" stdset="0">
<string>AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-80TURNS-WF</string>
</property>
<property name="Style_1">
<enum>caCartesianPlot::Lines</enum>
</property>
<property name="symbol_1">
<enum>caCartesianPlot::NoSymbol</enum>
</property>
<property name="color_1">
<color>
<red>0</red>
<green>85</green>
<blue>255</blue>
</color>
</property>
<property name="channels_2" stdset="0">
<string>AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-80TURNS-PEAKS</string>
</property>
<property name="Style_2">
<enum>caCartesianPlot::Sticks</enum>
</property>
<property name="symbol_2">
<enum>caCartesianPlot::NoSymbol</enum>
</property>
<property name="plotMode">
<enum>caCartesianPlot::PlotNPointsAndStop</enum>
</property>
<property name="triggerChannel" stdset="0">
<string notr="true"/>
</property>
<property name="eraseChannel" stdset="0">
<string notr="true"/>
</property>
<property name="eraseMode">
<enum>caCartesianPlot::ifzero</enum>
</property>
<property name="XaxisScaling" stdset="0">
<enum>caCartesianPlot::User</enum>
</property>
<property name="YaxisScaling" stdset="0">
<enum>caCartesianPlot::Auto</enum>
</property>
<property name="XaxisLimits">
<string>0;16384</string>
</property>
</widget>
<widget class="caCartesianPlot" name="cacartesianplot_2">
<property name="geometry">
<rect>
<x>1</x>
<y>560</y>
<width>703</width>
<height>250</height>
</rect>
</property>
<property name="channels_1" stdset="0">
<string>AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-2KTURNS-WF</string>
</property>
<property name="Style_1">
<enum>caCartesianPlot::Lines</enum>
</property>
<property name="symbol_1">
<enum>caCartesianPlot::NoSymbol</enum>
</property>
<property name="color_1">
<color>
<red>0</red>
<green>85</green>
<blue>255</blue>
</color>
</property>
<property name="channels_2" stdset="0">
<string>AGEBD-NTURNS:BPM-WF-ENUMERATE;AGEBD-NTURNS:STAGE0-Q-80TURNS-PEAKS;</string>
</property>
<property name="Style_2">
<enum>caCartesianPlot::Sticks</enum>
</property>
<property name="triggerChannel" stdset="0">
<string notr="true">ARS01-DBPM-0760:DAQ-PLT0-STG0-Q</string>
</property>
<property name="XaxisScaling" stdset="0">
<enum>caCartesianPlot::User</enum>
</property>
<property name="XaxisLimits">
<string>0;16384</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>20</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<customwidgets>
<customwidget>
<class>caNumeric</class>
<extends>QFrame</extends>
<header>caNumeric</header>
<class>caChoice</class>
<extends>QWidget</extends>
<header>caChoice</header>
</customwidget>
<customwidget>
<class>caToggleButton</class>
<extends>QCheckBox</extends>
<header>caToggleButton</header>
<class>caTextEntry</class>
<extends>caLineEdit</extends>
<header>caTextEntry</header>
</customwidget>
<customwidget>
<class>caLabel</class>
<extends>QLabel</extends>
<header>caLabel</header>
</customwidget>
<customwidget>
<class>caLineEdit</class>
<extends>QLineEdit</extends>
<header>caLineEdit</header>
</customwidget>
<customwidget>
<class>caCartesianPlot</class>
<extends>QwtPlot</extends>
<header>caCartesianPlot</header>
</customwidget>
<customwidget>
<class>caCalc</class>
<extends>QLabel</extends>
<header>caCalc</header>
</customwidget>
<customwidget>
<class>wmSignalPropagator</class>
<extends>QLabel</extends>
<header>wmSignalPropagator</header>
</customwidget>
<customwidget>
<class>QwtPlot</class>
<extends>QFrame</extends>
<header>qwt_plot.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
<connections>
<connection>
<sender>cacalc_2</sender>
<signal>emitSignal(bool)</signal>
<receiver>wmsignalpropagator</receiver>
<slot>reloadwindow()</slot>
<hints>
<hint type="sourcelabel">
<x>622</x>
<y>266</y>
</hint>
<hint type="destinationlabel">
<x>608</x>
<y>329</y>
</hint>
</hints>
</connection>
</connections>
</ui>