Skip to content

Commit 9d643e8

Browse files
MarkRiversMarkRivers
committed
Changed model enum values
1 parent 9eb4efa commit 9d643e8

File tree

5 files changed

+71
-229
lines changed

5 files changed

+71
-229
lines changed

‎quadEMApp/op/adl/quadEM.adl‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,22 +2439,7 @@ composite {
24392439
"composite file"="AH501.adl"
24402440
"dynamic attribute" {
24412441
vis="calc"
2442-
calc="A=4"
2443-
chan="$(P)$(R)Model"
2444-
}
2445-
}
2446-
composite {
2447-
object {
2448-
x=10
2449-
y=460
2450-
width=390
2451-
height=120
2452-
}
2453-
"composite name"=""
2454-
"composite file"="APS_EM.adl"
2455-
"dynamic attribute" {
2456-
vis="calc"
2457-
calc="A=1"
2442+
calc="A=3"
24582443
chan="$(P)$(R)Model"
24592444
}
24602445
}
@@ -2469,7 +2454,7 @@ composite {
24692454
"composite file"="AH401B.adl"
24702455
"dynamic attribute" {
24712456
vis="calc"
2472-
calc="(A=2) || (A=3)"
2457+
calc="(A=1) || (A=2)"
24732458
chan="$(P)$(R)Model"
24742459
}
24752460
}
@@ -2484,7 +2469,7 @@ composite {
24842469
"composite file"="AH501C.adl"
24852470
"dynamic attribute" {
24862471
vis="calc"
2487-
calc="(A=5)||(A=6)||(A=7)"
2472+
calc="(A=4)||(A=5)||(A=6)"
24882473
chan="$(P)$(R)Model"
24892474
}
24902475
}
@@ -2499,7 +2484,7 @@ composite {
24992484
"composite file"="TetrAMM.adl"
25002485
"dynamic attribute" {
25012486
vis="calc"
2502-
calc="A=8"
2487+
calc="A=7"
25032488
chan="$(P)$(R)Model"
25042489
}
25052490
}
@@ -2514,7 +2499,7 @@ composite {
25142499
"composite file"="NSLS_EM.adl"
25152500
"dynamic attribute" {
25162501
vis="calc"
2517-
calc="A=9"
2502+
calc="A=8"
25182503
chan="$(P)$(R)Model"
25192504
}
25202505
}
@@ -2529,7 +2514,7 @@ composite {
25292514
"composite file"="NSLS2_EM.adl"
25302515
"dynamic attribute" {
25312516
vis="calc"
2532-
calc="(A=10)"
2517+
calc="(A=9)"
25332518
chan="$(P)$(R)Model"
25342519
}
25352520
}
@@ -2544,7 +2529,7 @@ composite {
25442529
"composite file"="PCR4.adl"
25452530
"dynamic attribute" {
25462531
vis="calc"
2547-
calc="(A=12)"
2532+
calc="(A=11)"
25482533
chan="$(P)$(R)Model"
25492534
}
25502535
}

‎quadEMApp/op/bob/autoconvert/quadEM.bob‎

Lines changed: 25 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--Saved on 2025-11-19 13:42:26 by epics-->
2+
<!--Saved on 2025-11-20 13:19:47 by epics-->
33
<display version="2.0.0">
44
<name>quadEM</name>
55
<x>332</x>
@@ -2980,7 +2980,7 @@
29802980
<height>120</height>
29812981
<rules>
29822982
<rule name="vis_calc" prop_id="visible" out_exp="false">
2983-
<exp bool_exp="!(pv0==4)">
2983+
<exp bool_exp="!(pv0==3)">
29842984
<value>false</value>
29852985
</exp>
29862986
<pv_name>$(P)$(R)Model</pv_name>
@@ -2989,126 +2989,110 @@
29892989
</widget>
29902990
<widget type="embedded" version="2.0.0">
29912991
<name>composite #565</name>
2992-
<file>APS_EM.bob</file>
2993-
<x>10</x>
2994-
<y>460</y>
2995-
<width>390</width>
2996-
<height>120</height>
2997-
<rules>
2998-
<rule name="vis_calc" prop_id="visible" out_exp="false">
2999-
<exp bool_exp="!(pv0==1)">
3000-
<value>false</value>
3001-
</exp>
3002-
<pv_name>$(P)$(R)Model</pv_name>
3003-
</rule>
3004-
</rules>
3005-
</widget>
3006-
<widget type="embedded" version="2.0.0">
3007-
<name>composite #568</name>
30082992
<file>AH401B.bob</file>
30092993
<x>10</x>
30102994
<y>460</y>
30112995
<width>390</width>
30122996
<height>95</height>
30132997
<rules>
30142998
<rule name="vis_calc" prop_id="visible" out_exp="false">
3015-
<exp bool_exp="!((pv0==2) || (pv0==3))">
2999+
<exp bool_exp="!((pv0==1) || (pv0==2))">
30163000
<value>false</value>
30173001
</exp>
30183002
<pv_name>$(P)$(R)Model</pv_name>
30193003
</rule>
30203004
</rules>
30213005
</widget>
30223006
<widget type="embedded" version="2.0.0">
3023-
<name>composite #571</name>
3007+
<name>composite #568</name>
30243008
<file>AH501C.bob</file>
30253009
<x>10</x>
30263010
<y>460</y>
30273011
<width>390</width>
30283012
<height>145</height>
30293013
<rules>
30303014
<rule name="vis_calc" prop_id="visible" out_exp="false">
3031-
<exp bool_exp="!((pv0==5)||(pv0==6)||(pv0==7))">
3015+
<exp bool_exp="!((pv0==4)||(pv0==5)||(pv0==6))">
30323016
<value>false</value>
30333017
</exp>
30343018
<pv_name>$(P)$(R)Model</pv_name>
30353019
</rule>
30363020
</rules>
30373021
</widget>
30383022
<widget type="embedded" version="2.0.0">
3039-
<name>composite #574</name>
3023+
<name>composite #571</name>
30403024
<file>TetrAMM.bob</file>
30413025
<x>10</x>
30423026
<y>460</y>
30433027
<width>392</width>
30443028
<height>395</height>
30453029
<rules>
30463030
<rule name="vis_calc" prop_id="visible" out_exp="false">
3047-
<exp bool_exp="!(pv0==8)">
3031+
<exp bool_exp="!(pv0==7)">
30483032
<value>false</value>
30493033
</exp>
30503034
<pv_name>$(P)$(R)Model</pv_name>
30513035
</rule>
30523036
</rules>
30533037
</widget>
30543038
<widget type="embedded" version="2.0.0">
3055-
<name>composite #577</name>
3039+
<name>composite #574</name>
30563040
<file>NSLS_EM.bob</file>
30573041
<x>10</x>
30583042
<y>460</y>
30593043
<width>390</width>
30603044
<height>45</height>
30613045
<rules>
30623046
<rule name="vis_calc" prop_id="visible" out_exp="false">
3063-
<exp bool_exp="!(pv0==9)">
3047+
<exp bool_exp="!(pv0==8)">
30643048
<value>false</value>
30653049
</exp>
30663050
<pv_name>$(P)$(R)Model</pv_name>
30673051
</rule>
30683052
</rules>
30693053
</widget>
30703054
<widget type="embedded" version="2.0.0">
3071-
<name>composite #580</name>
3055+
<name>composite #577</name>
30723056
<file>NSLS2_EM.bob</file>
30733057
<x>10</x>
30743058
<y>460</y>
30753059
<width>390</width>
30763060
<height>269</height>
30773061
<rules>
30783062
<rule name="vis_calc" prop_id="visible" out_exp="false">
3079-
<exp bool_exp="!((pv0==10))">
3063+
<exp bool_exp="!((pv0==9))">
30803064
<value>false</value>
30813065
</exp>
30823066
<pv_name>$(P)$(R)Model</pv_name>
30833067
</rule>
30843068
</rules>
30853069
</widget>
30863070
<widget type="embedded" version="2.0.0">
3087-
<name>composite #583</name>
3071+
<name>composite #580</name>
30883072
<file>PCR4.bob</file>
30893073
<x>10</x>
30903074
<y>460</y>
30913075
<width>362</width>
30923076
<height>172</height>
30933077
<rules>
30943078
<rule name="vis_calc" prop_id="visible" out_exp="false">
3095-
<exp bool_exp="!((pv0==12))">
3079+
<exp bool_exp="!((pv0==11))">
30963080
<value>false</value>
30973081
</exp>
30983082
<pv_name>$(P)$(R)Model</pv_name>
30993083
</rule>
31003084
</rules>
31013085
</widget>
31023086
<widget type="group" version="2.0.0">
3103-
<name>composite #586</name>
3087+
<name>composite #583</name>
31043088
<x>30</x>
31053089
<y>435</y>
31063090
<width>275</width>
31073091
<height>20</height>
31083092
<style>3</style>
31093093
<transparent>true</transparent>
31103094
<widget type="label" version="2.0.0">
3111-
<name>text #589</name>
3095+
<name>text #586</name>
31123096
<text># To average fast</text>
31133097
<width>170</width>
31143098
<font>
@@ -3118,7 +3102,7 @@
31183102
<horizontal_alignment>2</horizontal_alignment>
31193103
</widget>
31203104
<widget type="textupdate" version="2.0.0">
3121-
<name>text update #592</name>
3105+
<name>text update #589</name>
31223106
<pv_name>$(P)$(R)NumFastAverage</pv_name>
31233107
<x>175</x>
31243108
<font>
@@ -3139,15 +3123,15 @@
31393123
</widget>
31403124
</widget>
31413125
<widget type="group" version="2.0.0">
3142-
<name>composite #596</name>
3126+
<name>composite #593</name>
31433127
<x>100</x>
31443128
<y>410</y>
31453129
<width>205</width>
31463130
<height>20</height>
31473131
<style>3</style>
31483132
<transparent>true</transparent>
31493133
<widget type="label" version="2.0.0">
3150-
<name>text #599</name>
3134+
<name>text #596</name>
31513135
<text># Averaged</text>
31523136
<font>
31533137
<font family="Liberation Sans" style="REGULAR" size="16.0">
@@ -3156,7 +3140,7 @@
31563140
<horizontal_alignment>2</horizontal_alignment>
31573141
</widget>
31583142
<widget type="textupdate" version="2.0.0">
3159-
<name>text update #602</name>
3143+
<name>text update #599</name>
31603144
<pv_name>$(P)$(R)NumAveraged_RBV</pv_name>
31613145
<x>105</x>
31623146
<font>
@@ -3177,7 +3161,7 @@
31773161
</widget>
31783162
</widget>
31793163
<widget type="label" version="2.0.0">
3180-
<name>text #606</name>
3164+
<name>text #603</name>
31813165
<text>Geometry</text>
31823166
<x>120</x>
31833167
<y>185</y>
@@ -3189,7 +3173,7 @@
31893173
<horizontal_alignment>2</horizontal_alignment>
31903174
</widget>
31913175
<widget type="textupdate" version="2.0.0">
3192-
<name>text update #609</name>
3176+
<name>text update #606</name>
31933177
<pv_name>$(P)$(R)Geometry_RBV</pv_name>
31943178
<x>300</x>
31953179
<y>185</y>
@@ -3210,7 +3194,7 @@
32103194
<border_alarm_sensitive>false</border_alarm_sensitive>
32113195
</widget>
32123196
<widget type="combo" version="2.0.0">
3213-
<name>menu #613</name>
3197+
<name>menu #610</name>
32143198
<pv_name>$(P)$(R)Geometry</pv_name>
32153199
<x>205</x>
32163200
<y>185</y>
@@ -3223,7 +3207,7 @@
32233207
<border_alarm_sensitive>false</border_alarm_sensitive>
32243208
</widget>
32253209
<widget type="label" version="2.0.0">
3226-
<name>text #616</name>
3210+
<name>text #613</name>
32273211
<text>Fast averaging scan</text>
32283212
<x>10</x>
32293213
<y>260</y>
@@ -3235,7 +3219,7 @@
32353219
<horizontal_alignment>2</horizontal_alignment>
32363220
</widget>
32373221
<widget type="combo" version="2.0.0">
3238-
<name>menu #619</name>
3222+
<name>menu #616</name>
32393223
<pv_name>$(P)$(R)FastAverageScan.SCAN</pv_name>
32403224
<x>205</x>
32413225
<y>260</y>
@@ -3248,7 +3232,7 @@
32483232
<border_alarm_sensitive>false</border_alarm_sensitive>
32493233
</widget>
32503234
<widget type="embedded" version="2.0.0">
3251-
<name>composite #622</name>
3235+
<name>composite #619</name>
32523236
<file>ADBuffers.bob</file>
32533237
<x>30</x>
32543238
<y>860</y>

0 commit comments

Comments
 (0)