From 688c912e227a8fd7e65da4c6b852159f802d60f8 Mon Sep 17 00:00:00 2001 From: rivers Date: Tue, 4 Aug 2009 18:33:54 +0000 Subject: [PATCH] Renamed ADSC external software trigger PVs to generic names. Removed related display button to generic areaDetector MEDM screen. git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9181 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/op/adl/adsc.adl | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/ADApp/op/adl/adsc.adl b/ADApp/op/adl/adsc.adl index 1df9b55..9466b8b 100644 --- a/ADApp/op/adl/adsc.adl +++ b/ADApp/op/adl/adsc.adl @@ -5,10 +5,10 @@ file { } display { object { - x=489 - y=91 + x=154 + y=74 width=480 - height=745 + height=705 } clr=14 bclr=4 @@ -100,21 +100,6 @@ text { textix="ADSC Detector" align="horiz. centered" } -"related display" { - object { - x=210 - y=710 - width=60 - height=18 - } - display[0] { - label="Detector control" - name="ADBase.adl" - args="P=$(P), R=$(R)" - } - clr=14 - bclr=51 -} text { object { x=112 @@ -845,7 +830,7 @@ text { height=18 } control { - chan="$(P)$(R)ADSCExTrCtl" + chan="$(P)$(R)ExSwTrCtl" clr=14 bclr=51 } @@ -860,7 +845,7 @@ text { height=18 } control { - chan="$(P)$(R)ADSCExTrCtl" + chan="$(P)$(R)ExSwTrCtl" clr=14 bclr=51 } @@ -888,7 +873,7 @@ text { height=15 } monitor { - chan="$(P)$(R)ADSCOkToExpose" + chan="$(P)$(R)ExSwTrOkToExp" clr=54 bclr=4 } @@ -1058,7 +1043,7 @@ text { height=15 } monitor { - chan="$(P)$(R)ADSCExTrCtl_RBV" + chan="$(P)$(R)ExSwTrCtlRsp" clr=54 bclr=4 }