From d212f9b7b1e0d62e5a8999f5e31effa2cfc950cf Mon Sep 17 00:00:00 2001 From: rivers Date: Wed, 25 Sep 2013 15:30:38 +0000 Subject: [PATCH] Add more intensifier stuff git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16934 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/op/adl/LightField.adl | 1167 +++++++++++++++++++---------------- 1 file changed, 641 insertions(+), 526 deletions(-) diff --git a/ADApp/op/adl/LightField.adl b/ADApp/op/adl/LightField.adl index 63999df..711d7f1 100644 --- a/ADApp/op/adl/LightField.adl +++ b/ADApp/op/adl/LightField.adl @@ -5,8 +5,8 @@ file { } display { object { - x=25 - y=243 + x=97 + y=104 width=1420 height=820 } @@ -122,50 +122,6 @@ composite { } } } -"text update" { - object { - x=241 - y=726 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)Temperature_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} -"text entry" { - object { - x=148 - y=725 - width=60 - height=20 - } - control { - chan="$(P)$(R)Temperature" - clr=14 - bclr=51 - } - limits { - } -} -text { - object { - x=27 - y=725 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Temperature" - align="horiz. right" -} composite { object { x=5 @@ -192,7 +148,7 @@ rectangle { x=5 y=340 width=335 - height=435 + height=410 } "basic attribute" { clr=14 @@ -769,74 +725,16 @@ composite { "composite name"="" "composite file"="ADPlugins.adl" } -text { - object { - x=47 - y=700 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Data type" - align="horiz. right" -} -"text update" { - object { - x=241 - y=701 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)DataType_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } -} composite { object { x=345 - y=450 + y=465 width=350 height=60 } "composite name"="" "composite file"="ADAttrFile.adl" } -text { - object { - x=27 - y=750 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Actual temperature" -} -"text update" { - object { - x=241 - y=750 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)TemperatureActual" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} composite { object { x=345 @@ -1149,7 +1047,7 @@ rectangle { x=345 y=230 width=350 - height=140 + height=160 } "basic attribute" { clr=14 @@ -1169,186 +1067,10 @@ text { textix="Spectrometer" align="horiz. centered" } -composite { - object { - x=392 - y=290 - width=284 - height=20 - } - "composite name"="" - children { - text { - object { - x=392 - y=290 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Center wavelength" - align="horiz. right" - } - "text entry" { - object { - x=531 - y=290 - width=59 - height=20 - } - control { - chan="$(P)$(R)LFGratingWavelength" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=597 - y=291 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)LFGratingWavelength_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=392 - y=315 - width=284 - height=20 - } - "composite name"="" - children { - "text entry" { - object { - x=531 - y=315 - width=59 - height=20 - } - control { - chan="$(P)$(R)LFEntranceWidth" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=597 - y=316 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)LFEntranceWidth_RBV" - clr=54 - bclr=4 - } - limits { - } - } - text { - object { - x=392 - y=315 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Entrance width" - align="horiz. right" - } - } -} -menu { - object { - x=470 - y=340 - width=120 - height=20 - } - control { - chan="$(P)$(R)LFExitPort" - clr=14 - bclr=51 - } -} -text { - object { - x=361 - y=340 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Exit port" - align="horiz. right" -} -"text update" { - object { - x=597 - y=342 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)LFExitPort_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } -} -menu { - object { - x=480 - y=265 - width=200 - height=20 - } - control { - chan="$(P)$(R)LFGrating" - clr=14 - bclr=51 - } -} -text { - object { - x=400 - y=265 - width=70 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Grating" - align="horiz. right" -} composite { object { x=345 - y=545 + y=530 width=675 height=230 } @@ -1357,7 +1079,7 @@ composite { composite { object { x=372 - y=751 + y=736 width=639 height=20 } @@ -1366,7 +1088,7 @@ composite { text { object { x=372 - y=751 + y=736 width=130 height=20 } @@ -1379,7 +1101,7 @@ composite { "text update" { object { x=511 - y=752 + y=737 width=500 height=18 } @@ -1397,7 +1119,7 @@ composite { text { object { x=352 - y=726 + y=711 width=150 height=20 } @@ -1410,7 +1132,7 @@ composite { composite { object { x=511 - y=703 + y=688 width=160 height=43 } @@ -1419,7 +1141,7 @@ composite { "text update" { object { x=511 - y=703 + y=688 width=160 height=18 } @@ -1435,7 +1157,7 @@ composite { "text entry" { object { x=511 - y=726 + y=711 width=160 height=20 } @@ -1453,7 +1175,7 @@ composite { composite { object { x=362 - y=678 + y=663 width=298 height=20 } @@ -1462,7 +1184,7 @@ composite { text { object { x=362 - y=678 + y=663 width=140 height=20 } @@ -1475,7 +1197,7 @@ composite { menu { object { x=511 - y=678 + y=663 width=64 height=20 } @@ -1488,7 +1210,7 @@ composite { "text update" { object { x=580 - y=679 + y=664 width=80 height=18 } @@ -1505,7 +1227,7 @@ composite { composite { object { x=392 - y=651 + y=636 width=264 height=22 } @@ -1514,7 +1236,7 @@ composite { text { object { x=392 - y=652 + y=637 width=110 height=20 } @@ -1527,7 +1249,7 @@ composite { "text entry" { object { x=511 - y=651 + y=636 width=60 height=22 } @@ -1542,7 +1264,7 @@ composite { "text update" { object { x=576 - y=653 + y=638 width=80 height=18 } @@ -1559,7 +1281,7 @@ composite { composite { object { x=412 - y=603 + y=588 width=599 height=43 } @@ -1568,7 +1290,7 @@ composite { text { object { x=412 - y=626 + y=611 width=90 height=20 } @@ -1581,7 +1303,7 @@ composite { composite { object { x=511 - y=603 + y=588 width=500 height=43 } @@ -1590,7 +1312,7 @@ composite { "text entry" { object { x=511 - y=626 + y=611 width=500 height=20 } @@ -1606,7 +1328,7 @@ composite { "text update" { object { x=511 - y=603 + y=588 width=500 height=18 } @@ -1626,7 +1348,7 @@ composite { "text entry" { object { x=511 - y=578 + y=563 width=500 height=20 } @@ -1642,7 +1364,7 @@ composite { "text update" { object { x=511 - y=555 + y=540 width=385 height=18 } @@ -1658,7 +1380,7 @@ composite { text { object { x=412 - y=578 + y=563 width=90 height=20 } @@ -1671,7 +1393,7 @@ composite { rectangle { object { x=345 - y=545 + y=530 width=675 height=230 } @@ -1683,7 +1405,7 @@ composite { composite { object { x=900 - y=555 + y=540 width=115 height=20 } @@ -1692,7 +1414,7 @@ composite { text { object { x=900 - y=555 + y=540 width=70 height=20 } @@ -1704,7 +1426,7 @@ composite { "text update" { object { x=975 - y=555 + y=540 width=40 height=20 } @@ -1722,7 +1444,7 @@ composite { text { object { x=695 - y=726 + y=711 width=230 height=20 } @@ -1733,68 +1455,6 @@ composite { } } } -rectangle { - object { - x=455 - y=378 - width=130 - height=21 - } - "basic attribute" { - clr=2 - } -} -text { - object { - x=441 - y=379 - width=159 - height=20 - } - "basic attribute" { - clr=54 - } - textix="Experiment" - align="horiz. centered" -} -menu { - object { - x=480 - y=411 - width=200 - height=20 - } - control { - chan="$(P)$(R)LFExperimentName" - clr=14 - bclr=51 - } -} -text { - object { - x=400 - y=411 - width=70 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Experiment" - align="horiz. right" -} -rectangle { - object { - x=345 - y=376 - width=350 - height=65 - } - "basic attribute" { - clr=14 - fill="outline" - } -} menu { object { x=148 @@ -2582,9 +2242,9 @@ composite { } rectangle { object { - x=1182 + x=1170 y=37 - width=105 + width=120 height=21 } "basic attribute" { @@ -2596,7 +2256,7 @@ rectangle { x=1055 y=35 width=350 - height=455 + height=380 } "basic attribute" { clr=14 @@ -2605,7 +2265,7 @@ rectangle { } text { object { - x=1162 + x=1152 y=38 width=157 height=20 @@ -2626,7 +2286,7 @@ text { "basic attribute" { clr=14 } - textix="Gain" + textix="Intensifier Gain" align="horiz. right" } "text entry" { @@ -2641,7 +2301,6 @@ text { clr=14 bclr=51 } - format="exponential" limits { } } @@ -2657,7 +2316,6 @@ text { clr=54 bclr=4 } - format="exponential" limits { } } @@ -2671,7 +2329,7 @@ text { "basic attribute" { clr=14 } - textix="Enable" + textix="Int. Enable" align="horiz. right" } menu { @@ -2806,133 +2464,32 @@ composite { x=1091 y=214 width=294 - height=145 + height=45 } "composite name"="" children { - composite { - object { - x=1091 - y=214 - width=294 - height=45 - } - "composite name"="" - children { - text { - object { - x=1091 - y=214 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Rep. Gate Width" - align="horiz. right" - } - "text entry" { - object { - x=1240 - y=214 - width=59 - height=20 - } - control { - chan="$(P)$(R)LFRepGateWidth" - clr=14 - bclr=51 - } - format="exponential" - limits { - } - } - "text update" { - object { - x=1306 - y=215 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)LFRepGateWidth_RBV" - clr=54 - bclr=4 - } - format="exponential" - limits { - } - } - text { - object { - x=1103 - y=239 - width=128 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Rep. Gate Delay" - align="horiz. right" - } - "text entry" { - object { - x=1240 - y=239 - width=59 - height=20 - } - control { - chan="$(P)$(R)LFRepGateDelay" - clr=14 - bclr=51 - } - format="exponential" - limits { - } - } - "text update" { - object { - x=1306 - y=240 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)LFRepGateDelay_RBV" - clr=54 - bclr=4 - } - format="exponential" - limits { - } - } - } - } text { object { x=1091 - y=264 + y=214 width=140 height=20 } "basic attribute" { clr=14 } - textix="Seq. Start Width" + textix="Rep. Gate Width" align="horiz. right" } "text entry" { object { x=1240 - y=264 + y=214 width=59 height=20 } control { - chan="$(P)$(R)LFSeqStartGateWidth" + chan="$(P)$(R)LFRepGateWidth" clr=14 bclr=51 } @@ -2943,12 +2500,12 @@ composite { "text update" { object { x=1306 - y=265 + y=215 width=79 height=18 } monitor { - chan="$(P)$(R)LFSeqStartGateWidth_RBV" + chan="$(P)$(R)LFRepGateWidth_RBV" clr=54 bclr=4 } @@ -2959,25 +2516,25 @@ composite { text { object { x=1103 - y=289 + y=239 width=128 height=20 } "basic attribute" { clr=14 } - textix="Seq. Start Delay" + textix="Rep. Gate Delay" align="horiz. right" } "text entry" { object { x=1240 - y=289 + y=239 width=59 height=20 } control { - chan="$(P)$(R)LFSeqStartGateDelay" + chan="$(P)$(R)LFRepGateDelay" clr=14 bclr=51 } @@ -2988,12 +2545,12 @@ composite { "text update" { object { x=1306 - y=290 + y=240 width=79 height=18 } monitor { - chan="$(P)$(R)LFSeqStartGateDelay_RBV" + chan="$(P)$(R)LFRepGateDelay_RBV" clr=54 bclr=4 } @@ -3001,6 +2558,194 @@ composite { limits { } } + } +} +text { + object { + x=1091 + y=264 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Seq. Start Width" + align="horiz. right" +} +"text entry" { + object { + x=1240 + y=264 + width=59 + height=20 + } + control { + chan="$(P)$(R)LFSeqStartGateWidth" + clr=14 + bclr=51 + } + format="exponential" + limits { + } +} +"text update" { + object { + x=1306 + y=265 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)LFSeqStartGateWidth_RBV" + clr=54 + bclr=4 + } + format="exponential" + limits { + } +} +text { + object { + x=1103 + y=289 + width=128 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Seq. Start Delay" + align="horiz. right" +} +"text entry" { + object { + x=1240 + y=289 + width=59 + height=20 + } + control { + chan="$(P)$(R)LFSeqStartGateDelay" + clr=14 + bclr=51 + } + format="exponential" + limits { + } +} +"text update" { + object { + x=1306 + y=290 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)LFSeqStartGateDelay_RBV" + clr=54 + bclr=4 + } + format="exponential" + limits { + } +} +text { + object { + x=1105 + y=189 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="SyncMaster2 Delay" + align="horiz. right" +} +"text entry" { + object { + x=1240 + y=189 + width=60 + height=20 + } + control { + chan="$(P)$(R)LFSyncMaster2Delay" + clr=14 + bclr=51 + } + format="exponential" + limits { + } +} +"text update" { + object { + x=1305 + y=190 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)LFSyncMaster2Delay_RBV" + clr=54 + bclr=4 + } + format="exponential" + limits { + } +} +text { + object { + x=1080 + y=164 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="SyncMaster" + align="horiz. right" +} +menu { + object { + x=1189 + y=164 + width=120 + height=20 + } + control { + chan="$(P)$(R)LFSyncMasterEnable" + clr=14 + bclr=51 + } +} +"text update" { + object { + x=1316 + y=166 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)LFSyncMasterEnable_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +composite { + object { + x=1091 + y=314 + width=294 + height=45 + } + "composite name"="" + children { text { object { x=1091 @@ -3095,26 +2840,26 @@ composite { } text { object { - x=1105 - y=189 - width=130 + x=1091 + y=364 + width=140 height=20 } "basic attribute" { clr=14 } - textix="SyncMaster2 Delay" + textix="Aux I/O Width" align="horiz. right" } "text entry" { object { x=1240 - y=189 - width=60 + y=364 + width=59 height=20 } control { - chan="$(P)$(R)LFSyncMaster2Delay" + chan="$(P)$(R)LFAuxWidth" clr=14 bclr=51 } @@ -3124,13 +2869,13 @@ text { } "text update" { object { - x=1305 - y=190 - width=80 + x=1306 + y=365 + width=79 height=18 } monitor { - chan="$(P)$(R)LFSyncMaster2Delay_RBV" + chan="$(P)$(R)LFAuxWidth_RBV" clr=54 bclr=4 } @@ -3140,39 +2885,367 @@ text { } text { object { - x=1080 - y=164 + x=1103 + y=389 + width=128 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Aux I/O Delay" + align="horiz. right" +} +"text entry" { + object { + x=1240 + y=389 + width=59 + height=20 + } + control { + chan="$(P)$(R)LFAuxDelay" + clr=14 + bclr=51 + } + format="exponential" + limits { + } +} +"text update" { + object { + x=1306 + y=390 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)LFAuxDelay_RBV" + clr=54 + bclr=4 + } + format="exponential" + limits { + } +} +composite { + object { + x=27 + y=675 + width=293 + height=70 + } + "composite name"="" + children { + "text update" { + object { + x=241 + y=701 + width=61 + height=18 + } + monitor { + chan="$(P)$(R)Temperature_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } + "text entry" { + object { + x=148 + y=700 + width=60 + height=20 + } + control { + chan="$(P)$(R)Temperature" + clr=14 + bclr=51 + } + limits { + } + } + text { + object { + x=27 + y=700 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Temperature" + align="horiz. right" + } + text { + object { + x=47 + y=675 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Data type" + align="horiz. right" + } + "text update" { + object { + x=241 + y=676 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)DataType_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + text { + object { + x=27 + y=725 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Actual temperature" + } + "text update" { + object { + x=241 + y=725 + width=61 + height=18 + } + monitor { + chan="$(P)$(R)TemperatureActual" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } + } +} +composite { + object { + x=345 + y=396 + width=350 + height=65 + } + "composite name"="" + children { + rectangle { + object { + x=455 + y=398 + width=130 + height=21 + } + "basic attribute" { + clr=2 + } + } + text { + object { + x=441 + y=399 + width=159 + height=20 + } + "basic attribute" { + clr=54 + } + textix="Experiment" + align="horiz. centered" + } + menu { + object { + x=480 + y=431 + width=200 + height=20 + } + control { + chan="$(P)$(R)LFExperimentName" + clr=14 + bclr=51 + } + } + text { + object { + x=400 + y=431 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Experiment" + align="horiz. right" + } + rectangle { + object { + x=345 + y=396 + width=350 + height=65 + } + "basic attribute" { + clr=14 + fill="outline" + } + } + } +} +text { + object { + x=392 + y=310 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Center wavelength" + align="horiz. right" +} +"text entry" { + object { + x=531 + y=310 + width=59 + height=20 + } + control { + chan="$(P)$(R)LFGratingWavelength" + clr=14 + bclr=51 + } + limits { + } +} +"text update" { + object { + x=597 + y=311 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)LFGratingWavelength_RBV" + clr=54 + bclr=4 + } + limits { + } +} +composite { + object { + x=392 + y=335 + width=284 + height=20 + } + "composite name"="" + children { + "text entry" { + object { + x=531 + y=335 + width=59 + height=20 + } + control { + chan="$(P)$(R)LFEntranceWidth" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=597 + y=336 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)LFEntranceWidth_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=392 + y=335 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Entrance width" + align="horiz. right" + } + } +} +menu { + object { + x=470 + y=360 + width=120 + height=20 + } + control { + chan="$(P)$(R)LFExitPort" + clr=14 + bclr=51 + } +} +text { + object { + x=361 + y=360 width=100 height=20 } "basic attribute" { clr=14 } - textix="SyncMaster" + textix="Exit port" align="horiz. right" } -menu { - object { - x=1189 - y=164 - width=120 - height=20 - } - control { - chan="$(P)$(R)LFSyncMasterEnable" - clr=14 - bclr=51 - } -} "text update" { object { - x=1316 - y=166 + x=597 + y=362 width=79 height=18 } monitor { - chan="$(P)$(R)LFSyncMasterEnable_RBV" + chan="$(P)$(R)LFExitPort_RBV" clr=54 bclr=4 } @@ -3180,3 +3253,45 @@ menu { limits { } } +menu { + object { + x=480 + y=285 + width=200 + height=20 + } + control { + chan="$(P)$(R)LFGrating" + clr=14 + bclr=51 + } +} +text { + object { + x=400 + y=285 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Grating" + align="horiz. right" +} +"text update" { + object { + x=480 + y=265 + width=200 + height=18 + } + monitor { + chan="$(P)$(R)LFGrating_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +}