diff --git a/RELEASE.md b/RELEASE.md index 6d1b279..b7b8b73 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -9,7 +9,7 @@ https://github.com/areaDetector/ADEiger/tags Release Notes ============= -R3-6 (June XXX, 2025) +R3-6 (January XXX, 2026) ---- * Added support for the Stream2 interface. Stream2 supports multiple thresholds. - Added new StreamVersion record to select the Stream or Stream2 interface. @@ -38,9 +38,15 @@ R3-6 (June XXX, 2025) For 16-bit data this would be a problem when there are over 32K counts per pixel. Since the maximum count rate is about 2e6 counts/s there should never be more than 20K counts in 0.01 seconds, and there should thus be no problem. -* BEFORE RELEASE. Check the function of InternalEnable mode to see if it works now. - The documentation said it was flaky in firmware 1.5.0, so it probably works now and the - documentation should be fixed in several places. +* Fixed issues with Internal Enable trigger mode. + - This mode was broken completely starting with R3-4 in June 2022. + It was always sending 0 as the TriggerExposure value due to a bug introduced in the driver. + - The TriggerExposure value was only used in Internal Enable mode. + This is confusing, since AcquireTime is used for all other modes. + - The TriggerExposure record was eliminated, and AcquireTime is now used in Internal Enable mode. + - This breaks backwards compatibility, but since Internal Enable mode has not worked at all + for 3.5 years, it is likely to have a small impact. + - eigerBase.template, the OPI screens, and the Sphinx documentation have been modified to remove this record. R3-5 (May 14, 2025) ---- diff --git a/docs/ADEiger/eiger.rst b/docs/ADEiger/eiger.rst index 2a5fdac..5f7c2ac 100644 --- a/docs/ADEiger/eiger.rst +++ b/docs/ADEiger/eiger.rst @@ -27,9 +27,6 @@ so no library from Dectris is required. The images can pulled from the detector as HDF5 files, as a ZeroMQ stream or both. The files can be both saved to disk and passed to the areaDetector pipeline at the same time. -All trigger modes are supported, although Internal Enable mode seems -to not be working properly. See Known Issues. - This driver inherits from `ADDriver`_. It implements many of the parameters in `asynNDArrayDriver`_ and in `ADDriver`_. It also implements a number of parameters that are specific to the Eiger @@ -121,9 +118,8 @@ NumImages is set to 1 temporarily during the acquisition. Triggers for **Internal Enable** mode are sent by processing the Trigger PV. The exposure for each individual image is given by the -TriggerExposure PV and can change between triggers in the same -acquisition. This mode is experimental as of firmware 1.5.0. See Known -Issues. CHECK THIS. +AcquireTime PV and can change between triggers in the same +acquisition. Manual Trigger -------------- @@ -132,9 +128,7 @@ On **Internal Series** and **Internal Enable** modes, if the ManualTrigger PV is set to **Yes**, the triggers are not auto generated by the driver. Instead, they are sent by processing the Trigger PV. On **Internal Enable** mode the trigger carries an exposure value that -can change for each trigger, which is set by the TriggerExposure PV. -Note that the **Internal Enable** mode is experimental as of firmware -1.5.0, see Known Issues. CHECK THIS. +can change for each trigger, which is set by the AcquireTime PV. Data Acquisition ---------------- @@ -524,10 +518,6 @@ Trigger Setup - Software trigger to be used on modes Internal Series and Internal Enable when ManualTrigger is set - Trigger - ao - * - N.A. - - Exposure to be used with the triggers on the Internal Enable trigger mode - - TriggerExposure, TriggerExposure_RBV - - ao, ai * - detector/config/ntrigger - Number of triggers for the acquisition - NumTriggers, NumTriggers_RBV @@ -995,10 +985,3 @@ A few status parameters are read every time the ReadStatus PV is processed. A high rate polling causes issues, sometimes causing the detector to hang when, in conjunction, a parameter is set to an invalid value. - -Internal Enable Mode -~~~~~~~~~~~~~~~~~~~~ - -The Internal Enable mode is marked as experimental by Dectris. At the -moment it is very flaky (firmware 1.5.0) and often doesn't generate -all the files it is supposed to. diff --git a/eigerApp/Db/eigerBase.template b/eigerApp/Db/eigerBase.template index d2a5bd3..db2ab49 100644 --- a/eigerApp/Db/eigerBase.template +++ b/eigerApp/Db/eigerBase.template @@ -243,27 +243,6 @@ record(bi,"$(P)$(R)ManualTrigger_RBV") { field(SCAN, "I/O Intr") } -# Exposure for triggers on INTE mode -record(ao, "$(P)$(R)TriggerExposure") -{ - field(PINI, "YES") - field(DTYP, "asynFloat64") - field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))TRIGGER_EXPOSURE") - field(DESC, "Trigger Exposure for INTE mode") - field(EGU, "s") - field(PREC, "3") -} - -record(ai, "$(P)$(R)TriggerExposure_RBV") -{ - field(DTYP, "asynFloat64") - field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))TRIGGER_EXPOSURE") - field(DESC, "Trigger Exposure for INTE mode") - field(EGU, "s") - field(PREC, "3") - field(SCAN, "I/O Intr") -} - # Trigger the detector record(ao, "$(P)$(R)Trigger") { field(DTYP, "asynInt32") diff --git a/eigerApp/Db/eigerBase_settings.req b/eigerApp/Db/eigerBase_settings.req index e9e47d0..b05fde2 100644 --- a/eigerApp/Db/eigerBase_settings.req +++ b/eigerApp/Db/eigerBase_settings.req @@ -12,7 +12,6 @@ $(P)$(R)ThresholdEnergy ################# $(P)$(R)NumTriggers $(P)$(R)ManualTrigger -$(P)$(R)TriggerExposure ################# # Readout Setup # diff --git a/eigerApp/op/adl/eiger1Trigger.adl b/eigerApp/op/adl/eiger1Trigger.adl index c3f9a9f..cfcdd5f 100644 --- a/eigerApp/op/adl/eiger1Trigger.adl +++ b/eigerApp/op/adl/eiger1Trigger.adl @@ -1,14 +1,14 @@ file { - name="/home/epics/devel/areaDetector/ADEiger/eigerApp/op/adl/eiger1Trigger.adl" - version=030109 + name="/home/epics/support/areaDetector-3-13/ADEiger/eigerApp/op/adl/eiger1Trigger.adl" + version=030117 } display { object { x=1151 y=186 width=350 - height=155 + height=130 } clr=14 bclr=4 @@ -92,7 +92,7 @@ rectangle { x=0 y=0 width=350 - height=155 + height=130 } "basic attribute" { clr=14 @@ -165,55 +165,10 @@ menu { limits { } } -text { - object { - x=10 - y=55 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Trig. Exposure" - align="horiz. right" -} -"text entry" { - object { - x=155 - y=55 - width=100 - height=20 - } - control { - chan="$(P)$(R)TriggerExposure" - clr=14 - bclr=51 - } - format="exponential" - limits { - } -} -"text update" { - object { - x=260 - y=56 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)TriggerExposure_RBV" - clr=54 - bclr=4 - } - format="exponential" - limits { - } -} text { object { x=30 - y=80 + y=55 width=120 height=20 } @@ -226,7 +181,7 @@ text { menu { object { x=155 - y=80 + y=55 width=100 height=20 } @@ -239,7 +194,7 @@ menu { "text update" { object { x=260 - y=81 + y=56 width=80 height=18 } @@ -256,7 +211,7 @@ menu { text { object { x=50 - y=130 + y=105 width=100 height=20 } @@ -269,7 +224,7 @@ text { "text update" { object { x=260 - y=131 + y=106 width=80 height=18 } @@ -284,7 +239,7 @@ text { "text entry" { object { x=155 - y=130 + y=105 width=100 height=20 } @@ -299,7 +254,7 @@ text { "message button" { object { x=155 - y=105 + y=80 width=100 height=20 } @@ -314,7 +269,7 @@ text { text { object { x=10 - y=105 + y=80 width=140 height=20 } diff --git a/eigerApp/op/adl/eiger2Detector.adl b/eigerApp/op/adl/eiger2Detector.adl index d46a9ae..5c5b11d 100644 --- a/eigerApp/op/adl/eiger2Detector.adl +++ b/eigerApp/op/adl/eiger2Detector.adl @@ -1,6 +1,6 @@ file { - name="/home/epics/devel/areaDetector/ADEiger/eigerApp/op/adl/eiger2Detector.adl" + name="/home/epics/support/areaDetector/ADEiger/eigerApp/op/adl/eiger2Detector.adl" version=030117 } display { @@ -234,7 +234,7 @@ composite { composite { object { x=360 - y=585 + y=560 width=350 height=380 } @@ -246,7 +246,7 @@ composite { x=360 y=375 width=350 - height=205 + height=180 } "composite name"="" "composite file"="eiger2Trigger.adl" diff --git a/eigerApp/op/adl/eiger2Trigger.adl b/eigerApp/op/adl/eiger2Trigger.adl index 389411c..9f89b47 100644 --- a/eigerApp/op/adl/eiger2Trigger.adl +++ b/eigerApp/op/adl/eiger2Trigger.adl @@ -1,14 +1,14 @@ file { - name="/home/epics/devel/areaDetector/ADEiger/eigerApp/op/adl/eiger2Trigger.adl" - version=030109 + name="/home/epics/support/areaDetector-3-13/ADEiger/eigerApp/op/adl/eiger2Trigger.adl" + version=030117 } display { object { - x=1027 - y=344 + x=853 + y=336 width=350 - height=205 + height=180 } clr=14 bclr=4 @@ -92,7 +92,7 @@ rectangle { x=0 y=0 width=350 - height=205 + height=180 } "basic attribute" { clr=14 @@ -209,61 +209,63 @@ menu { } text { object { - x=30 - y=130 - width=120 + x=40 + y=55 + width=110 height=20 } "basic attribute" { clr=14 } - textix="Manual Trig." + textix="Start Delay" align="horiz. right" } -menu { +"text entry" { object { x=155 - y=130 + y=55 width=100 height=20 } control { - chan="$(P)$(R)ManualTrigger" + chan="$(P)$(R)TriggerStartDelay" clr=14 bclr=51 } + format="exponential" + limits { + } } "text update" { object { x=260 - y=131 + y=56 width=80 height=18 } monitor { - chan="$(P)$(R)ManualTrigger_RBV" + chan="$(P)$(R)TriggerStartDelay_RBV" clr=54 - bclr=12 + bclr=4 } - clrmod="alarm" - format="string" + format="exponential" limits { } } text { object { - x=10 + x=30 y=105 - width=140 + width=120 height=20 } "basic attribute" { clr=14 } - textix="Trig. Exposure" + textix="Manual Trig." align="horiz. right" } -"text entry" { +menu { object { x=155 y=105 @@ -271,13 +273,10 @@ text { height=20 } control { - chan="$(P)$(R)TriggerExposure" + chan="$(P)$(R)ManualTrigger" clr=14 bclr=51 } - format="exponential" - limits { - } } "text update" { object { @@ -287,60 +286,59 @@ text { height=18 } monitor { - chan="$(P)$(R)TriggerExposure_RBV" + chan="$(P)$(R)ManualTrigger_RBV" clr=54 - bclr=4 + bclr=12 } - format="exponential" + clrmod="alarm" + format="string" limits { } } -text { +"message button" { object { - x=10 - y=55 - width=140 + x=155 + y=130 + width=100 height=20 } - "basic attribute" { + control { + chan="$(P)$(R)Trigger" clr=14 + bclr=16 } - textix="Start Delay" - align="horiz. right" + label="Trigger" + press_msg="0" } -"text entry" { +text { object { - x=155 - y=55 + x=50 + y=155 width=100 height=20 } - control { - chan="$(P)$(R)TriggerStartDelay" + "basic attribute" { clr=14 - bclr=51 - } - format="exponential" - limits { } + textix="# Triggers" + align="horiz. right" } "text update" { object { x=260 - y=56 + y=156 width=80 height=18 } monitor { - chan="$(P)$(R)TriggerStartDelay_RBV" + chan="$(P)$(R)NumTriggers_RBV" clr=54 bclr=4 } - format="exponential" limits { } } -"message button" { +"text entry" { object { x=155 y=155 @@ -348,71 +346,17 @@ text { height=20 } control { - chan="$(P)$(R)Trigger" + chan="$(P)$(R)NumTriggers" clr=14 - bclr=16 - } - label="Trigger" - press_msg="0" -} -composite { - object { - x=50 - y=180 - width=290 - height=20 + bclr=51 } - "composite name"="" - children { - text { - object { - x=50 - y=180 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="# Triggers" - align="horiz. right" - } - "text update" { - object { - x=260 - y=181 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)NumTriggers_RBV" - clr=54 - bclr=4 - } - limits { - } - } - "text entry" { - object { - x=155 - y=180 - width=100 - height=20 - } - control { - chan="$(P)$(R)NumTriggers" - clr=14 - bclr=51 - } - limits { - } - } + limits { } } text { object { x=10 - y=155 + y=130 width=140 height=20 } diff --git a/eigerApp/op/adl/eigerDetector.adl b/eigerApp/op/adl/eigerDetector.adl index d855d67..2deacbd 100644 --- a/eigerApp/op/adl/eigerDetector.adl +++ b/eigerApp/op/adl/eigerDetector.adl @@ -1,6 +1,6 @@ file { - name="/home/epics/devel/areaDetector-3-14/ADEiger/eigerApp/op/adl/eigerDetector.adl" + name="/home/epics/support/areaDetector/ADEiger/eigerApp/op/adl/eigerDetector.adl" version=030117 } display { @@ -8,7 +8,7 @@ display { x=157 y=59 width=1425 - height=935 + height=910 } clr=14 bclr=4 @@ -194,7 +194,7 @@ composite { composite { object { x=360 - y=770 + y=745 width=350 height=160 } @@ -236,7 +236,7 @@ composite { x=360 y=225 width=350 - height=155 + height=130 } "composite name"="" "composite file"="eiger1Trigger.adl" @@ -244,7 +244,7 @@ composite { composite { object { x=360 - y=385 + y=360 width=350 height=380 } diff --git a/eigerApp/op/bob/autoconvert/eiger1Trigger.bob b/eigerApp/op/bob/autoconvert/eiger1Trigger.bob index 3fc7ebf..60446fd 100644 --- a/eigerApp/op/bob/autoconvert/eiger1Trigger.bob +++ b/eigerApp/op/bob/autoconvert/eiger1Trigger.bob @@ -1,10 +1,11 @@ + eiger1Trigger 1151 186 350 - 155 + 130 @@ -14,7 +15,7 @@ rectangle #6 350 - 155 + 130 1 @@ -106,61 +107,9 @@ text #25 - Trig. Exposure - 10 - 55 - 140 - - - - - 2 - - - text entry #28 - $(P)$(R)TriggerExposure - 155 - 55 - - - - - - - - - 2 - false - false - - - text update #32 - $(P)$(R)TriggerExposure_RBV - 260 - 56 - 80 - 18 - - - - - - - - - - - - - 2 - false - false - - - text #36 Manual Trig. 30 - 80 + 55 120 @@ -169,10 +118,10 @@ 2 - menu #39 + menu #28 $(P)$(R)ManualTrigger 155 - 80 + 55 20 @@ -181,10 +130,10 @@ false - text update #42 + text update #31 $(P)$(R)ManualTrigger_RBV 260 - 81 + 56 80 18 @@ -203,10 +152,10 @@ false - text #46 + text #35 # Triggers 50 - 130 + 105 @@ -214,10 +163,10 @@ 2 - text update #49 + text update #38 $(P)$(R)NumTriggers_RBV 260 - 131 + 106 80 18 @@ -237,10 +186,10 @@ false - text entry #53 + text entry #42 $(P)$(R)NumTriggers 155 - 130 + 105 @@ -254,7 +203,7 @@ false - message button #57 + message button #46 $(P)$(R)Trigger @@ -265,7 +214,7 @@ $(P)$(R)Trigger Trigger 155 - 105 + 80 20 @@ -273,10 +222,10 @@ - text #60 + text #49 Software Trig. 10 - 105 + 80 140 diff --git a/eigerApp/op/bob/autoconvert/eiger2Detector.bob b/eigerApp/op/bob/autoconvert/eiger2Detector.bob index df2f278..c61d51a 100644 --- a/eigerApp/op/bob/autoconvert/eiger2Detector.bob +++ b/eigerApp/op/bob/autoconvert/eiger2Detector.bob @@ -1,5 +1,5 @@ - + eiger2Detector 280 @@ -142,7 +142,7 @@ composite #36 eigerAcquisitionStatus.bob 360 - 585 + 560 350 380 @@ -152,7 +152,7 @@ 360 375 350 - 205 + 180 composite #40 diff --git a/eigerApp/op/bob/autoconvert/eiger2Trigger.bob b/eigerApp/op/bob/autoconvert/eiger2Trigger.bob index 1eb9eac..9f41613 100644 --- a/eigerApp/op/bob/autoconvert/eiger2Trigger.bob +++ b/eigerApp/op/bob/autoconvert/eiger2Trigger.bob @@ -1,10 +1,11 @@ + eiger2Trigger - 1027 - 344 + 853 + 336 350 - 205 + 180 @@ -14,7 +15,7 @@ rectangle #6 350 - 205 + 180 1 @@ -153,33 +154,38 @@ text #35 - Manual Trig. - 30 - 130 - 120 + Start Delay + 40 + 55 + 110 2 - - menu #38 - $(P)$(R)ManualTrigger + + text entry #38 + $(P)$(R)TriggerStartDelay 155 - 130 - 20 + 55 + + + + + 2 + false false - text update #41 - $(P)$(R)ManualTrigger_RBV + text update #42 + $(P)$(R)TriggerStartDelay_RBV 260 - 131 + 56 80 18 @@ -191,44 +197,40 @@ - + - 6 + 2 false + false - text #45 - Trig. Exposure - 10 + text #46 + Manual Trig. + 30 105 - 140 + 120 2 - - text entry #48 - $(P)$(R)TriggerExposure + + menu #49 + $(P)$(R)ManualTrigger 155 105 - - - - + 20 - 2 - false false text update #52 - $(P)$(R)TriggerExposure_RBV + $(P)$(R)ManualTrigger_RBV 260 106 80 @@ -242,47 +244,47 @@ - + - 2 + 6 false - false + + + message button #56 + + + $(P)$(R)Trigger + 0 + Write + + + $(P)$(R)Trigger + Trigger + 155 + 130 + 20 + + + + - text #56 - Start Delay - 10 - 55 - 140 + text #59 + # Triggers + 50 + 155 2 - - text entry #59 - $(P)$(R)TriggerStartDelay - 155 - 55 - - - - - - - - - 2 - false - false - - text update #63 - $(P)$(R)TriggerStartDelay_RBV + text update #62 + $(P)$(R)NumTriggers_RBV 260 - 56 + 156 80 18 @@ -297,91 +299,32 @@ - 2 + 1 false false - - message button #67 - - - $(P)$(R)Trigger - 0 - Write - - - $(P)$(R)Trigger - Trigger + + text entry #66 + $(P)$(R)NumTriggers 155 155 - 20 + + + + - + - - - composite #70 - 50 - 180 - 290 - 20 - - true - - text #73 - # Triggers - - - - - 2 - - - text update #76 - $(P)$(R)NumTriggers_RBV - 210 - 1 - 80 - 18 - - - - - - - - - - - - - 1 - false - false - - - text entry #80 - $(P)$(R)NumTriggers - 105 - - - - - - - - - 1 - false - false - + 1 + false + false - text #84 + text #70 Software Trig. 10 - 155 + 130 140 diff --git a/eigerApp/op/bob/autoconvert/eigerDetector.bob b/eigerApp/op/bob/autoconvert/eigerDetector.bob index 195dfb3..0df2a96 100644 --- a/eigerApp/op/bob/autoconvert/eigerDetector.bob +++ b/eigerApp/op/bob/autoconvert/eigerDetector.bob @@ -1,11 +1,11 @@ - + eigerDetector 157 59 1425 - 935 + 910 @@ -110,7 +110,7 @@ composite #28 ADBuffers.bob 360 - 770 + 745 350 160 @@ -144,13 +144,13 @@ 360 225 350 - 155 + 130 composite #38 eigerAcquisitionStatus.bob 360 - 385 + 360 350 380 diff --git a/eigerApp/op/edl/autoconvert/eiger1Trigger.edl b/eigerApp/op/edl/autoconvert/eiger1Trigger.edl index 5207180..91454b1 100644 --- a/eigerApp/op/edl/autoconvert/eiger1Trigger.edl +++ b/eigerApp/op/edl/autoconvert/eiger1Trigger.edl @@ -6,7 +6,7 @@ release 1 x 1151 y 186 w 350 -h 155 +h 130 font "helvetica-medium-r-18.0" ctlFont "helvetica-bold-r-10.0" btnFont "helvetica-medium-r-18.0" @@ -33,7 +33,7 @@ release 0 x 0 y 0 w 350 -h 155 +h 130 lineColor rgb 0 0 0 fillColor rgb 0 0 0 lineWidth 0 @@ -119,76 +119,6 @@ newPos objType "controls" endObjectProperties -# (Static Text) -object activeXTextClass -beginObjectProperties -major 4 -minor 1 -release 1 -x 10 -y 55 -w 140 -h 20 -font "helvetica-medium-r-14.0" -fontAlign "right" -fgColor rgb 0 0 0 -bgColor index 3 -useDisplayBg -value { - "Trig. Exposure" -} -endObjectProperties - -# (Text Control) -object activeXTextDspClass -beginObjectProperties -major 4 -minor 7 -release 0 -x 155 -y 55 -w 100 -h 20 -controlPv "$(P)$(R)TriggerExposure" -format "exponential" -font "helvetica-medium-r-12.0" -fontAlign "left" -fgColor rgb 0 0 0 -bgColor rgb 29440 57088 65280 -editable -motifWidget -limitsFromDb -nullColor rgb 60928 46592 11008 -smartRefresh -fastUpdate -newPos -objType "controls" -endObjectProperties - -# (Text Monitor) -object activeXTextDspClass:noedit -beginObjectProperties -major 4 -minor 7 -release 0 -x 260 -y 56 -w 80 -h 18 -controlPv "$(P)$(R)TriggerExposure_RBV" -format "exponential" -font "helvetica-medium-r-14.0" -fontAlign "left" -fgColor rgb 2560 0 47104 -bgColor rgb 47872 47872 47872 -limitsFromDb -nullColor rgb 60928 46592 11008 -smartRefresh -fastUpdate -newPos -objType "controls" -endObjectProperties - # (Static Text) object activeXTextClass beginObjectProperties @@ -196,7 +126,7 @@ major 4 minor 1 release 1 x 30 -y 80 +y 55 w 120 h 20 font "helvetica-medium-r-14.0" @@ -216,7 +146,7 @@ major 4 minor 7 release 0 x 260 -y 81 +y 56 w 80 h 18 controlPv "$(P)$(R)ManualTrigger_RBV" @@ -241,7 +171,7 @@ major 4 minor 1 release 1 x 50 -y 130 +y 105 w 100 h 20 font "helvetica-medium-r-14.0" @@ -261,7 +191,7 @@ major 4 minor 7 release 0 x 260 -y 131 +y 106 w 80 h 18 controlPv "$(P)$(R)NumTriggers_RBV" @@ -285,7 +215,7 @@ major 4 minor 7 release 0 x 155 -y 130 +y 105 w 100 h 20 controlPv "$(P)$(R)NumTriggers" @@ -311,7 +241,7 @@ major 4 minor 1 release 1 x 10 -y 105 +y 80 w 140 h 20 font "helvetica-medium-r-14.0" @@ -351,7 +281,7 @@ major 4 minor 0 release 0 x 155 -y 80 +y 55 w 100 h 20 fgColor rgb 0 0 0 @@ -371,7 +301,7 @@ major 4 minor 0 release 0 x 155 -y 105 +y 80 w 100 h 20 fgColor rgb 0 0 0 diff --git a/eigerApp/op/edl/autoconvert/eiger2Detector.edl b/eigerApp/op/edl/autoconvert/eiger2Detector.edl index 2b71980..64f27f1 100644 --- a/eigerApp/op/edl/autoconvert/eiger2Detector.edl +++ b/eigerApp/op/edl/autoconvert/eiger2Detector.edl @@ -583,7 +583,7 @@ major 4 minor 0 release 0 x 360 -y 585 +y 560 w 350 h 380 @@ -596,7 +596,7 @@ major 4 minor 1 release 0 x 360 -y 585 +y 560 w 350 h 380 fgColor rgb 0 0 0 @@ -628,7 +628,7 @@ release 0 x 360 y 375 w 350 -h 205 +h 180 beginGroup @@ -641,7 +641,7 @@ release 0 x 360 y 375 w 350 -h 205 +h 180 fgColor rgb 0 0 0 bgColor rgb 65280 65280 65280 topShadowColor rgb 65280 65280 65280 diff --git a/eigerApp/op/edl/autoconvert/eiger2Trigger.edl b/eigerApp/op/edl/autoconvert/eiger2Trigger.edl index 3d2efdf..b45bb0a 100644 --- a/eigerApp/op/edl/autoconvert/eiger2Trigger.edl +++ b/eigerApp/op/edl/autoconvert/eiger2Trigger.edl @@ -3,10 +3,10 @@ beginScreenProperties major 4 minor 0 release 1 -x 1027 -y 344 +x 853 +y 336 w 350 -h 205 +h 180 font "helvetica-medium-r-18.0" ctlFont "helvetica-bold-r-10.0" btnFont "helvetica-medium-r-18.0" @@ -33,7 +33,7 @@ release 0 x 0 y 0 w 350 -h 205 +h 180 lineColor rgb 0 0 0 fillColor rgb 0 0 0 lineWidth 0 @@ -169,54 +169,9 @@ beginObjectProperties major 4 minor 1 release 1 -x 30 -y 130 -w 120 -h 20 -font "helvetica-medium-r-14.0" -fontAlign "right" -fgColor rgb 0 0 0 -bgColor index 3 -useDisplayBg -value { - "Manual Trig." -} -endObjectProperties - -# (Text Monitor) -object activeXTextDspClass:noedit -beginObjectProperties -major 4 -minor 7 -release 0 -x 260 -y 131 -w 80 -h 18 -controlPv "$(P)$(R)ManualTrigger_RBV" -format "string" -font "helvetica-medium-r-14.0" -fontAlign "left" -fgColor rgb 0 65535 0 -fgAlarm -bgColor rgb 17920 17920 17920 -limitsFromDb -nullColor rgb 60928 46592 11008 -smartRefresh -fastUpdate -newPos -objType "controls" -endObjectProperties - -# (Static Text) -object activeXTextClass -beginObjectProperties -major 4 -minor 1 -release 1 -x 10 -y 105 -w 140 +x 40 +y 55 +w 110 h 20 font "helvetica-medium-r-14.0" fontAlign "right" @@ -224,7 +179,7 @@ fgColor rgb 0 0 0 bgColor index 3 useDisplayBg value { - "Trig. Exposure" + "Start Delay" } endObjectProperties @@ -235,10 +190,10 @@ major 4 minor 7 release 0 x 155 -y 105 +y 55 w 100 h 20 -controlPv "$(P)$(R)TriggerExposure" +controlPv "$(P)$(R)TriggerStartDelay" format "exponential" font "helvetica-medium-r-12.0" fontAlign "left" @@ -261,10 +216,10 @@ major 4 minor 7 release 0 x 260 -y 106 +y 56 w 80 h 18 -controlPv "$(P)$(R)TriggerExposure_RBV" +controlPv "$(P)$(R)TriggerStartDelay_RBV" format "exponential" font "helvetica-medium-r-14.0" fontAlign "left" @@ -284,9 +239,9 @@ beginObjectProperties major 4 minor 1 release 1 -x 10 -y 55 -w 140 +x 30 +y 105 +w 120 h 20 font "helvetica-medium-r-14.0" fontAlign "right" @@ -294,36 +249,10 @@ fgColor rgb 0 0 0 bgColor index 3 useDisplayBg value { - "Start Delay" + "Manual Trig." } endObjectProperties -# (Text Control) -object activeXTextDspClass -beginObjectProperties -major 4 -minor 7 -release 0 -x 155 -y 55 -w 100 -h 20 -controlPv "$(P)$(R)TriggerStartDelay" -format "exponential" -font "helvetica-medium-r-12.0" -fontAlign "left" -fgColor rgb 0 0 0 -bgColor rgb 29440 57088 65280 -editable -motifWidget -limitsFromDb -nullColor rgb 60928 46592 11008 -smartRefresh -fastUpdate -newPos -objType "controls" -endObjectProperties - # (Text Monitor) object activeXTextDspClass:noedit beginObjectProperties @@ -331,15 +260,16 @@ major 4 minor 7 release 0 x 260 -y 56 +y 106 w 80 h 18 -controlPv "$(P)$(R)TriggerStartDelay_RBV" -format "exponential" +controlPv "$(P)$(R)ManualTrigger_RBV" +format "string" font "helvetica-medium-r-14.0" fontAlign "left" -fgColor rgb 2560 0 47104 -bgColor rgb 47872 47872 47872 +fgColor rgb 0 65535 0 +fgAlarm +bgColor rgb 17920 17920 17920 limitsFromDb nullColor rgb 60928 46592 11008 smartRefresh @@ -348,19 +278,6 @@ newPos objType "controls" endObjectProperties -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 50 -y 180 -w 290 -h 20 - -beginGroup - # (Static Text) object activeXTextClass beginObjectProperties @@ -368,7 +285,7 @@ major 4 minor 1 release 1 x 50 -y 180 +y 155 w 100 h 20 font "helvetica-medium-r-14.0" @@ -388,7 +305,7 @@ major 4 minor 7 release 0 x 260 -y 181 +y 156 w 80 h 18 controlPv "$(P)$(R)NumTriggers_RBV" @@ -412,7 +329,7 @@ major 4 minor 7 release 0 x 155 -y 180 +y 155 w 100 h 20 controlPv "$(P)$(R)NumTriggers" @@ -431,11 +348,6 @@ newPos objType "controls" endObjectProperties -endGroup - -endObjectProperties - - # (Static Text) object activeXTextClass beginObjectProperties @@ -443,7 +355,7 @@ major 4 minor 1 release 1 x 10 -y 155 +y 130 w 140 h 20 font "helvetica-medium-r-14.0" @@ -503,7 +415,7 @@ major 4 minor 0 release 0 x 155 -y 130 +y 105 w 100 h 20 fgColor rgb 0 0 0 @@ -523,7 +435,7 @@ major 4 minor 0 release 0 x 155 -y 155 +y 130 w 100 h 20 fgColor rgb 0 0 0 @@ -540,21 +452,4 @@ offLabel "Trigger" useEnumNumeric font "helvetica-medium-r-12.0" endObjectProperties -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 50 -y 180 -w 290 -h 20 - -beginGroup - -endGroup - -endObjectProperties - diff --git a/eigerApp/op/edl/autoconvert/eigerDetector.edl b/eigerApp/op/edl/autoconvert/eigerDetector.edl index 5b39f78..1f328f9 100644 --- a/eigerApp/op/edl/autoconvert/eigerDetector.edl +++ b/eigerApp/op/edl/autoconvert/eigerDetector.edl @@ -6,7 +6,7 @@ release 1 x 157 y 59 w 1425 -h 935 +h 910 font "helvetica-medium-r-18.0" ctlFont "helvetica-bold-r-10.0" btnFont "helvetica-medium-r-18.0" @@ -60,24 +60,11 @@ value { } endObjectProperties -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 5 -y 705 -w 350 -h 165 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 5 y 705 @@ -97,30 +84,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 5 -y 386 -w 350 -h 80 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 5 y 386 @@ -140,30 +108,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 715 -y 525 -w 350 -h 155 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 715 y 525 @@ -183,30 +132,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 1070 -y 440 -w 350 -h 155 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 1070 y 440 @@ -226,30 +156,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 5 -y 470 -w 350 -h 230 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 5 y 470 @@ -269,30 +180,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 715 -y 685 -w 350 -h 105 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 715 y 685 @@ -312,30 +204,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 715 -y 40 -w 350 -h 480 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 715 y 40 @@ -355,30 +228,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 1070 -y 40 -w 350 -h 395 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 1070 y 40 @@ -398,33 +252,14 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 360 -y 770 -w 350 -h 160 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 360 -y 770 +y 745 w 350 h 160 fgColor rgb 0 0 0 @@ -441,30 +276,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 5 -y 41 -w 350 -h 340 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 5 y 41 @@ -484,30 +300,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 715 -y 795 -w 350 -h 110 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 715 y 795 @@ -527,30 +324,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 360 -y 40 -w 350 -h 180 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 360 y 40 @@ -570,35 +348,16 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 360 -y 225 -w 350 -h 155 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 360 y 225 w 350 -h 155 +h 130 fgColor rgb 0 0 0 bgColor rgb 65280 65280 65280 topShadowColor rgb 65280 65280 65280 @@ -613,33 +372,14 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 360 -y 385 -w 350 -h 380 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 360 -y 385 +y 360 w 350 h 380 fgColor rgb 0 0 0 @@ -656,30 +396,11 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - -# (Group) -object activeGroupClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 1070 -y 600 -w 350 -h 255 - -beginGroup - # (Embedded Window) object activePipClass beginObjectProperties major 4 -minor 1 +minor 0 release 0 x 1070 y 600 @@ -699,9 +420,3 @@ displayFileName { noScroll endObjectProperties -endGroup - -visMin "A" -visMax "1" -endObjectProperties - diff --git a/eigerApp/op/opi/autoconvert/eiger1Trigger.opi b/eigerApp/op/opi/autoconvert/eiger1Trigger.opi index a439129..7123174 100644 --- a/eigerApp/op/opi/autoconvert/eiger1Trigger.opi +++ b/eigerApp/op/opi/autoconvert/eiger1Trigger.opi @@ -14,7 +14,7 @@ 5 - 155 + 130 true @@ -61,7 +61,7 @@ false - 155 + 130 true @@ -319,159 +319,6 @@ $(pv_value) 250 31 - - - false - - - - - - - 0 - 1 - true - - - - - - - 20 - 2 - Label - - - true - true - false - - - false - Trig. Exposure - - true - 1 - true - Label - 140 - false - 10 - 55 - - - - false - false - false - - - - false - - - - 3 - 1 - - true - - - - false - - - - 2 - 20 - 0 - false - Infinity - -Infinity - false - Text Input - 0 - false - 0 - true - $(P)$(R)TriggerExposure - - false - 0.0 - - - true - true - false - - - 0 - false - true - false - false - - - $(pv_name) -$(pv_value) - false - true - Text Input - 100 - 155 - 55 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - - - false - - - - 2 - 18 - 0 - Text Update - 0 - true - $(P)$(R)TriggerExposure_RBV - - 0.0 - - - true - true - false - - - false - ###### - $(pv_name) -$(pv_value) - false - 1 - true - Text Update - 80 - false - 260 - 56 - false @@ -510,7 +357,7 @@ $(pv_value) 120 false 30 - 80 + 55 @@ -554,7 +401,7 @@ $(pv_value) Menu Button 100 155 - 80 + 55 @@ -605,7 +452,7 @@ $(pv_value) 80 false 260 - 81 + 56 @@ -645,7 +492,7 @@ $(pv_value) 100 false 50 - 130 + 105 @@ -696,7 +543,7 @@ $(pv_value) 80 false 260 - 131 + 106 @@ -758,7 +605,7 @@ $(pv_value) Text Input 100 155 - 130 + 105 @@ -811,7 +658,7 @@ $(pv_value) Action Button 100 155 - 105 + 80 @@ -851,6 +698,6 @@ $(pv_value) 140 false 10 - 105 + 80 diff --git a/eigerApp/op/opi/autoconvert/eiger2Detector.opi b/eigerApp/op/opi/autoconvert/eiger2Detector.opi index a6e4a7b..0852ff3 100644 --- a/eigerApp/op/opi/autoconvert/eiger2Detector.opi +++ b/eigerApp/op/opi/autoconvert/eiger2Detector.opi @@ -592,7 +592,7 @@ $(pv_value) Linking Container 350 360 - 585 + 560 @@ -612,7 +612,7 @@ $(pv_value) - 205 + 180 true diff --git a/eigerApp/op/opi/autoconvert/eiger2Trigger.opi b/eigerApp/op/opi/autoconvert/eiger2Trigger.opi index 56d2014..ed05c92 100644 --- a/eigerApp/op/opi/autoconvert/eiger2Trigger.opi +++ b/eigerApp/op/opi/autoconvert/eiger2Trigger.opi @@ -14,7 +14,7 @@ 5 - 205 + 180 true @@ -28,8 +28,8 @@ false Display 350 - 1027 - 344 + 853 + 336 false @@ -61,7 +61,7 @@ false - 205 + 180 true @@ -144,199 +144,6 @@ $(pv_value) 54 2 - - - - - - - - - 0 - 1 - true - false - - Default - - - - - 20 - false - - true - - Grouping Container - - - true - true - false - - - false - - true - true - Grouping Container - 290 - 50 - 180 - - - false - - - - - - - 0 - 1 - true - - - - - - - 20 - 2 - Label - - - true - true - false - - - false - # Triggers - - true - 1 - true - Label - 100 - false - 0 - 0 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - - - false - - - - 1 - 18 - 0 - Text Update - 0 - true - $(P)$(R)NumTriggers_RBV - - 0.0 - - - true - true - false - - - false - ###### - $(pv_name) -$(pv_value) - false - 1 - true - Text Update - 80 - false - 210 - 1 - - - - false - false - false - - - - false - - - - 3 - 1 - - true - - - - false - - - - 1 - 20 - 0 - false - Infinity - -Infinity - false - Text Input - 0 - false - 0 - true - $(P)$(R)NumTriggers - - false - 0.0 - - - true - true - false - - - 0 - false - true - false - false - - - $(pv_name) -$(pv_value) - false - true - Text Input - 100 - 105 - 0 - - false @@ -676,21 +483,21 @@ $(pv_value) false - Manual Trig. + Start Delay true 1 true Label - 120 + 110 false - 30 - 130 + 40 + 55 - + - true false + false false @@ -699,21 +506,33 @@ $(pv_value) - 6 + 3 1 + true - Default + false + 2 20 - - Menu Button - $(P)$(R)ManualTrigger + 0 + false + Infinity + -Infinity + false + Text Input + 0 + false + 0 + true + $(P)$(R)TriggerStartDelay + false + 0.0 true @@ -721,15 +540,21 @@ $(pv_value) false - false + 0 + false + true + false + false + + $(pv_name) $(pv_value) false true - Menu Button + Text Input 100 155 - 130 + 55 @@ -737,9 +562,9 @@ $(pv_value) false false - + - false + true @@ -749,17 +574,17 @@ $(pv_value) - true + false - + - 4 + 2 18 0 Text Update 0 true - $(P)$(R)ManualTrigger_RBV + $(P)$(R)TriggerStartDelay_RBV 0.0 @@ -780,7 +605,7 @@ $(pv_value) 80 false 260 - 131 + 56 @@ -811,21 +636,21 @@ $(pv_value) false - Trig. Exposure + Manual Trig. true 1 true Label - 140 + 120 false - 10 + 30 105 - + + true false - false false @@ -834,33 +659,21 @@ $(pv_value) - 3 + 6 1 - true - + Default false - 2 20 - 0 - false - Infinity - -Infinity - false - Text Input - 0 - false - 0 - true - $(P)$(R)TriggerExposure + + Menu Button + $(P)$(R)ManualTrigger - false - 0.0 true @@ -868,18 +681,12 @@ $(pv_value) false - 0 - false - true - false - false - - + false $(pv_name) $(pv_value) false true - Text Input + Menu Button 100 155 105 @@ -890,9 +697,9 @@ $(pv_value) false false - + - true + false @@ -902,17 +709,17 @@ $(pv_value) - false + true - + - 2 + 4 18 0 Text Update 0 true - $(P)$(R)TriggerExposure_RBV + $(P)$(R)ManualTrigger_RBV 0.0 @@ -935,12 +742,22 @@ $(pv_value) 260 106 - - - false + + + + $(P)$(R)Trigger + 0 + 10 + + + + + false + false - + + false @@ -948,14 +765,18 @@ $(pv_value) 1 true - + Default + false 20 - 2 - Label + + Action Button + 0 + $(P)$(R)Trigger + true @@ -963,57 +784,38 @@ $(pv_value) false - false - Start Delay - - true - 1 + + Trigger + false + $(pv_name) +$(pv_value) true - Label - 140 - false - 10 - 55 + Action Button + 100 + 155 + 130 - + - false false - false - + - false - 3 + 0 1 - true - false - 2 20 - 0 - false - Infinity - -Infinity - false - Text Input - 0 - false - 0 - true - $(P)$(R)TriggerStartDelay - - false - 0.0 + 2 + Label true @@ -1021,21 +823,17 @@ $(pv_value) false - 0 - false - true - false - false - - - $(pv_name) -$(pv_value) - false + false + # Triggers + + true + 1 true - Text Input + Label 100 - 155 - 55 + false + 50 + 155 @@ -1059,13 +857,13 @@ $(pv_value) - 2 + 1 18 0 Text Update 0 true - $(P)$(R)TriggerStartDelay_RBV + $(P)$(R)NumTriggers_RBV 0.0 @@ -1086,43 +884,47 @@ $(pv_value) 80 false 260 - 56 + 156 - - - - $(P)$(R)Trigger - 0 - 10 - - - - + + false + false false - + false - 0 + 3 1 + true - Default + false + 1 20 - - Action Button - 0 - $(P)$(R)Trigger + 0 + false + Infinity + -Infinity + false + Text Input + 0 + false + 0 + true + $(P)$(R)NumTriggers + false + 0.0 true @@ -1130,13 +932,18 @@ $(pv_value) false + 0 + false + true + false + false - Trigger - false + $(pv_name) $(pv_value) + false true - Action Button + Text Input 100 155 155 @@ -1179,6 +986,6 @@ $(pv_value) 140 false 10 - 155 + 130 diff --git a/eigerApp/op/opi/autoconvert/eigerDetector.opi b/eigerApp/op/opi/autoconvert/eigerDetector.opi index 356e9f1..7e2d071 100644 --- a/eigerApp/op/opi/autoconvert/eigerDetector.opi +++ b/eigerApp/op/opi/autoconvert/eigerDetector.opi @@ -14,7 +14,7 @@ 5 - 935 + 910 true @@ -436,7 +436,7 @@ $(pv_value) Linking Container 350 360 - 770 + 745 @@ -573,7 +573,7 @@ $(pv_value) - 155 + 130 true @@ -631,7 +631,7 @@ $(pv_value) Linking Container 350 360 - 385 + 360 diff --git a/eigerApp/op/ui/autoconvert/eiger1Trigger.ui b/eigerApp/op/ui/autoconvert/eiger1Trigger.ui index b7e9b8b..30e5423 100644 --- a/eigerApp/op/ui/autoconvert/eiger1Trigger.ui +++ b/eigerApp/op/ui/autoconvert/eiger1Trigger.ui @@ -7,7 +7,7 @@ 1151 186 350 - 155 + 130 @@ -85,6 +85,16 @@ caChoice > QPushButton { padding: 1px; } +/* when font specified, no font sizing is done any more, font: 10pt; is not bad. You could Enable this when you converted from .adl files +caRelatedDisplay > QPushButton { +font: 10pt; +} + +caShellCommand > QPushButton { +font: 10pt; +} +*/ + caSlider::groove:horizontal { border: 1px solid #bbb; background: lightgrey; @@ -115,7 +125,7 @@ border-radius: 2px; 0 0 350 - 155 + 130 @@ -333,147 +343,6 @@ border-radius: 2px; - - QFrame::NoFrame - - - - 0 - 0 - 0 - - - - - 0 - 0 - 0 - - - - Trig. Exposure - - - ESimpleLabel::WidthAndHeight - - - Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignVCenter - - - - 10 - 55 - 140 - 20 - - - - - - - 155 - 55 - 100 - 20 - - - - caLineEdit::WidthAndHeight - - - $(P)$(R)TriggerExposure - - - - 0 - 0 - 0 - - - - - 115 - 223 - 255 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - caLineEdit::Static - - - exponential - - - - - - 260 - 56 - 80 - 18 - - - - caLineEdit::WidthAndHeight - - - $(P)$(R)TriggerExposure_RBV - - - - 10 - 0 - 184 - - - - - 187 - 187 - 187 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - - - exponential - - - caLineEdit::Static - - - QFrame::NoFrame @@ -503,7 +372,7 @@ border-radius: 2px; 30 - 80 + 55 120 20 @@ -513,7 +382,7 @@ border-radius: 2px; 155 - 80 + 55 100 20 @@ -539,11 +408,11 @@ border-radius: 2px; caMenu::Static - + 260 - 81 + 56 80 18 @@ -593,7 +462,7 @@ border-radius: 2px; caLineEdit::Alarm_Static - + QFrame::NoFrame @@ -623,17 +492,17 @@ border-radius: 2px; 50 - 130 + 105 100 20 - + 260 - 131 + 106 80 18 @@ -683,11 +552,11 @@ border-radius: 2px; caLineEdit::Static - + 155 - 130 + 105 100 20 @@ -738,7 +607,7 @@ border-radius: 2px; 155 - 105 + 80 100 20 @@ -773,7 +642,7 @@ border-radius: 2px; caMessageButton::Static - + QFrame::NoFrame @@ -803,7 +672,7 @@ border-radius: 2px; 10 - 105 + 80 140 20 @@ -816,15 +685,12 @@ border-radius: 2px; caLabel_2 caLabel_3 caLabel_4 - caLabel_5 caMenu_0 caLineEdit_0 - caTextEntry_0 - caLineEdit_1 caMenu_1 + caLineEdit_1 caLineEdit_2 - caLineEdit_3 - caTextEntry_1 + caTextEntry_0 caMessageButton_0 diff --git a/eigerApp/op/ui/autoconvert/eiger2Detector.ui b/eigerApp/op/ui/autoconvert/eiger2Detector.ui index 8933128..869b0ed 100644 --- a/eigerApp/op/ui/autoconvert/eiger2Detector.ui +++ b/eigerApp/op/ui/autoconvert/eiger2Detector.ui @@ -477,7 +477,7 @@ border-radius: 2px; 360 - 585 + 560 352 382 @@ -485,7 +485,7 @@ border-radius: 2px; 360 - 585 + 560 350 380 @@ -503,7 +503,7 @@ border-radius: 2px; 360 375 352 - 207 + 182 @@ -511,7 +511,7 @@ border-radius: 2px; 360 375 350 - 205 + 180 diff --git a/eigerApp/op/ui/autoconvert/eiger2Trigger.ui b/eigerApp/op/ui/autoconvert/eiger2Trigger.ui index 593ad70..0ca6dfb 100644 --- a/eigerApp/op/ui/autoconvert/eiger2Trigger.ui +++ b/eigerApp/op/ui/autoconvert/eiger2Trigger.ui @@ -4,10 +4,10 @@ - 1027 - 344 + 853 + 336 350 - 205 + 180 @@ -85,6 +85,16 @@ caChoice > QPushButton { padding: 1px; } +/* when font specified, no font sizing is done any more, font: 10pt; is not bad. You could Enable this when you converted from .adl files +caRelatedDisplay > QPushButton { +font: 10pt; +} + +caShellCommand > QPushButton { +font: 10pt; +} +*/ + caSlider::groove:horizontal { border: 1px solid #bbb; background: lightgrey; @@ -115,7 +125,7 @@ border-radius: 2px; 0 0 350 - 205 + 180 @@ -471,7 +481,7 @@ border-radius: 2px; - Manual Trig. + Start Delay ESimpleLabel::WidthAndHeight @@ -481,24 +491,27 @@ border-radius: 2px; - 30 - 130 - 120 + 40 + 55 + 110 20 - + 155 - 130 + 55 100 20 + + caLineEdit::WidthAndHeight + - $(P)$(R)ManualTrigger + $(P)$(R)TriggerStartDelay @@ -514,15 +527,33 @@ border-radius: 2px; 255 + + caLineEdit::Channel + + + caLineEdit::Channel + + + caLineEdit::Channel + + + 0.0 + + + 1.0 + - caMenu::Static + caLineEdit::Static + + + exponential 260 - 131 + 56 80 18 @@ -531,7 +562,7 @@ border-radius: 2px; caLineEdit::WidthAndHeight - $(P)$(R)ManualTrigger_RBV + $(P)$(R)TriggerStartDelay_RBV @@ -542,9 +573,9 @@ border-radius: 2px; - 70 - 70 - 70 + 187 + 187 + 187 @@ -566,10 +597,10 @@ border-radius: 2px; Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - string + exponential - caLineEdit::Alarm_Static + caLineEdit::Static @@ -591,7 +622,7 @@ border-radius: 2px; - Trig. Exposure + Manual Trig. ESimpleLabel::WidthAndHeight @@ -601,14 +632,14 @@ border-radius: 2px; - 10 + 30 105 - 140 + 120 20 - + 155 @@ -617,11 +648,8 @@ border-radius: 2px; 20 - - caLineEdit::WidthAndHeight - - $(P)$(R)TriggerExposure + $(P)$(R)ManualTrigger @@ -637,26 +665,8 @@ border-radius: 2px; 255 - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - caLineEdit::Static - - - exponential + caMenu::Static @@ -672,7 +682,7 @@ border-radius: 2px; caLineEdit::WidthAndHeight - $(P)$(R)TriggerExposure_RBV + $(P)$(R)ManualTrigger_RBV @@ -683,9 +693,9 @@ border-radius: 2px; - 187 - 187 - 187 + 70 + 70 + 70 @@ -707,10 +717,49 @@ border-radius: 2px; Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - exponential + string - caLineEdit::Static + caLineEdit::Alarm_Static + + + + + + 155 + 130 + 100 + 20 + + + + EPushButton::WidthAndHeight + + + $(P)$(R)Trigger + + + + 0 + 0 + 0 + + + + + 30 + 187 + 0 + + + + Trigger + + + 0 + + + caMessageButton::Static @@ -732,7 +781,7 @@ border-radius: 2px; - Start Delay + # Triggers ESimpleLabel::WidthAndHeight @@ -742,69 +791,18 @@ border-radius: 2px; - 10 - 55 - 140 - 20 - - - - - - - 155 - 55 + 50 + 155 100 20 - - caLineEdit::WidthAndHeight - - - $(P)$(R)TriggerStartDelay - - - - 0 - 0 - 0 - - - - - 115 - 223 - 255 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - caLineEdit::Static - - - exponential - 260 - 56 + 156 80 18 @@ -813,7 +811,7 @@ border-radius: 2px; caLineEdit::WidthAndHeight - $(P)$(R)TriggerStartDelay_RBV + $(P)$(R)NumTriggers_RBV @@ -848,13 +846,13 @@ border-radius: 2px; Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - exponential + decimal caLineEdit::Static - + 155 @@ -864,10 +862,10 @@ border-radius: 2px; - EPushButton::WidthAndHeight + caLineEdit::WidthAndHeight - $(P)$(R)Trigger + $(P)$(R)NumTriggers @@ -878,173 +876,34 @@ border-radius: 2px; - 30 - 187 - 0 + 115 + 223 + 255 - - Trigger + + caLineEdit::Channel - - 0 + + caLineEdit::Channel + + + caLineEdit::Channel + + + 0.0 + + + 1.0 - caMessageButton::Static + caLineEdit::Static - - - - - 50 - 180 - 292 - 22 - + + decimal - - - QFrame::NoFrame - - - - 0 - 0 - 0 - - - - - 0 - 0 - 0 - - - - # Triggers - - - ESimpleLabel::WidthAndHeight - - - Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignVCenter - - - - 0 - 0 - 100 - 20 - - - - - - - 210 - 1 - 80 - 18 - - - - caLineEdit::WidthAndHeight - - - $(P)$(R)NumTriggers_RBV - - - - 10 - 0 - 184 - - - - - 187 - 187 - 187 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - - - decimal - - - caLineEdit::Static - - - - - - 105 - 0 - 100 - 20 - - - - caLineEdit::WidthAndHeight - - - $(P)$(R)NumTriggers - - - - 0 - 0 - 0 - - - - - 115 - 223 - 255 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - caLineEdit::Static - - - decimal - - - + QFrame::NoFrame @@ -1074,7 +933,7 @@ border-radius: 2px; 10 - 155 + 130 140 20 @@ -1089,21 +948,17 @@ border-radius: 2px; caLabel_4 caLabel_5 caLabel_6 - caFrame_0 - caLabel_7 caMenu_0 caLineEdit_0 caMenu_1 caLineEdit_1 - caMenu_2 - caLineEdit_2 caTextEntry_0 + caLineEdit_2 + caMenu_2 caLineEdit_3 - caTextEntry_1 - caLineEdit_4 caMessageButton_0 - caLineEdit_5 - caTextEntry_2 + caLineEdit_4 + caTextEntry_1 \ No newline at end of file diff --git a/eigerApp/op/ui/autoconvert/eigerDetector.ui b/eigerApp/op/ui/autoconvert/eigerDetector.ui index 0088bb2..9df47a2 100644 --- a/eigerApp/op/ui/autoconvert/eigerDetector.ui +++ b/eigerApp/op/ui/autoconvert/eigerDetector.ui @@ -7,7 +7,7 @@ 157 59 1425 - 935 + 910 @@ -381,7 +381,7 @@ border-radius: 2px; 360 - 770 + 745 354 164 @@ -389,7 +389,7 @@ border-radius: 2px; 360 - 770 + 745 352 162 @@ -479,7 +479,7 @@ border-radius: 2px; 360 225 352 - 157 + 132 @@ -487,7 +487,7 @@ border-radius: 2px; 360 225 350 - 155 + 130 @@ -501,7 +501,7 @@ border-radius: 2px; 360 - 385 + 360 352 382 @@ -509,7 +509,7 @@ border-radius: 2px; 360 - 385 + 360 350 380 diff --git a/eigerApp/src/eigerDetector.cpp b/eigerApp/src/eigerDetector.cpp index ca68e23..bede7f1 100644 --- a/eigerApp/src/eigerDetector.cpp +++ b/eigerApp/src/eigerDetector.cpp @@ -253,7 +253,6 @@ eigerDetector::eigerDetector (const char *portName, const char *serverHostname, mFWAutoRemove = mParams.create(EigFWAutoRemoveStr, asynParamInt32); mTrigger = mParams.create(EigTriggerStr, asynParamInt32); - mTriggerExp = mParams.create(EigTriggerExpStr, asynParamFloat64); mManualTrigger = mParams.create(EigManualTriggerStr, asynParamInt32); mArmed = mParams.create(EigArmedStr, asynParamInt32); mSequenceId = mParams.create(EigSequenceIdStr, asynParamInt32); @@ -775,7 +774,7 @@ void eigerDetector::controlTask (void) int dataSource, adStatus; int sequenceId, saveFiles, numImages, numTriggers; int numImagesPerFile; - double acquirePeriod, triggerStartDelay, triggerTimeout = 0.0, triggerExposure = 0.0; + double acquireTime, acquirePeriod, triggerStartDelay, triggerTimeout = 0.0; int savedNumImages, filePerms; lock(); @@ -807,6 +806,7 @@ void eigerDetector::controlTask (void) mSaveFiles->get(saveFiles); mFWNImgsPerFile->get(numImagesPerFile); mAcquirePeriod->get(acquirePeriod); + mAcquireTime->get(acquireTime); mNumImages->get(numImages); mNTriggers->get(numTriggers); getIntegerParam(ADTriggerMode, &triggerMode); @@ -935,7 +935,6 @@ void eigerDetector::controlTask (void) mTriggerStartDelay->get(triggerStartDelay); triggerTimeout += triggerStartDelay; } - triggerExposure = 0.0; } getIntegerParam(ADStatus, &adStatus); @@ -952,20 +951,20 @@ void eigerDetector::controlTask (void) lock(); } - // triggerExposure might have changed - if(triggerMode == TRIGGER_MODE_EXTE) + // acquireTime might have changed + if(triggerMode == TRIGGER_MODE_INTE) { - mTriggerExp->get(triggerExposure); - triggerTimeout = triggerExposure + 1.0; + mAcquireTime->get(acquireTime); + triggerTimeout = acquireTime + 1.0; } if(doTrigger) { FLOW_ARGS("sending trigger %d/%d. timeout=%.6f, exposure=%.6f", - triggers+1, numTriggers, triggerTimeout, triggerExposure); + triggers+1, numTriggers, triggerTimeout, acquireTime); setShutter(1); unlock(); - status = mApi.trigger(triggerTimeout, triggerExposure); + status = mApi.trigger(triggerTimeout, acquireTime); lock(); setShutter(0); ++triggers; diff --git a/eigerApp/src/eigerDetector.h b/eigerApp/src/eigerDetector.h index f05688d..ce47c5a 100644 --- a/eigerApp/src/eigerDetector.h +++ b/eigerApp/src/eigerDetector.h @@ -47,7 +47,6 @@ typedef enum { #define EigThreshold2EnableStr "THRESHOLD2_ENABLE" #define EigThresholdDiffEnableStr "THRESHOLD_DIFF_ENABLE" #define EigTriggerStr "TRIGGER" -#define EigTriggerExpStr "TRIGGER_EXPOSURE" #define EigNTriggersStr "NUM_TRIGGERS" #define EigManualTriggerStr "MANUAL_TRIGGER" #define EigTriggerStartDelayStr "TRIGGER_START_DELAY" @@ -167,7 +166,6 @@ class eigerDetector : public ADDriver EigerParam *mDataSource; EigerParam *mFWAutoRemove; EigerParam *mTrigger; - EigerParam *mTriggerExp; EigerParam *mManualTrigger; EigerParam *mTriggerStartDelay; EigerParam *mArmed;