From 5bf5b59f756fcb2ae27aec3239a0169e12ce8072 Mon Sep 17 00:00:00 2001 From: rivers Date: Wed, 25 Sep 2013 01:57:51 +0000 Subject: [PATCH] Additional intensifier parameters, etc. git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16926 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/Db/LightField.template | 149 +++++++++++++++++++++++++++++-- ADApp/Db/LightField_settings.req | 13 ++- 2 files changed, 151 insertions(+), 11 deletions(-) diff --git a/ADApp/Db/LightField.template b/ADApp/Db/LightField.template index a6d86f8..4fd613d 100644 --- a/ADApp/Db/LightField.template +++ b/ADApp/Db/LightField.template @@ -31,7 +31,6 @@ record(mbbo, "$(P)$(R)TriggerMode") field(ZRVL, "2") field(ONST, "External") field(ONVL, "1") - field(VAL, "2") } record(mbbi, "$(P)$(R)TriggerMode_RBV") @@ -264,6 +263,40 @@ record(bi, "$(P)$(R)LFBackgroundEnable_RBV") field(SCAN, "I/O Intr") } +record(bo, "$(P)$(R)LFIntensifierEnable") +{ + field(PINI, "YES") + field(DTYP, "asynInt32") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_INTENSIFIER_ENABLE") + field(ZNAM, "Disable") + field(ONAM, "Enable") +} + +record(bi, "$(P)$(R)LFIntensifierEnable_RBV") +{ + field(DTYP, "asynInt32") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_INTENSIFIER_ENABLE") + field(ZNAM, "Disable") + field(ONAM, "Enable") + field(SCAN, "I/O Intr") +} + +record(ao, "$(P)$(R)LFIntensifierGain") +{ + field(PINI, "YES") + field(DTYP, "asynInt32") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_INTENSIFIER_GAIN") + field(PREC, "0") +} + +record(ai, "$(P)$(R)LFIntensifierGain_RBV") +{ + field(DTYP, "asynInt32") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_INTENSIFIER_GAIN") + field(SCAN, "I/O Intr") + field(PREC, "0") +} + record(mbbo, "$(P)$(R)LFGatingMode") { field(PINI, "YES") @@ -302,34 +335,132 @@ record(ai, "$(P)$(R)LFTriggerFrequency_RBV") field(PREC, "0") } -record(ao, "$(P)$(R)LFGateWidth") +record(bo, "$(P)$(R)LFSyncMasterEnable") +{ + field(PINI, "YES") + field(DTYP, "asynInt32") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SYNCMASTER_ENABLE") + field(ZNAM, "Disable") + field(ONAM, "Enable") +} + +record(bi, "$(P)$(R)LFSyncMasterEnable_RBV") +{ + field(DTYP, "asynInt32") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SYNCMASTER_ENABLE") + field(ZNAM, "Disable") + field(ONAM, "Enable") + field(SCAN, "I/O Intr") +} + +record(ao, "$(P)$(R)LFSyncMaster2Delay") { field(PINI, "YES") field(DTYP, "asynFloat64") - field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_GATE_WIDTH") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SYNCMASTER2_DELAY") field(PREC, "2") } -record(ai, "$(P)$(R)LFGateWidth_RBV") +record(ai, "$(P)$(R)LFSyncMaster2Delay_RBV") { field(DTYP, "asynFloat64") - field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_GATE_WIDTH") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT)))LF_SYNCMASTER2_DELAY") field(SCAN, "I/O Intr") field(PREC, "2") } -record(ao, "$(P)$(R)LFGateDelay") +record(ao, "$(P)$(R)LFRepGateWidth") { field(PINI, "YES") field(DTYP, "asynFloat64") - field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_GATE_DELAY") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_REP_GATE_WIDTH") field(PREC, "2") } -record(ai, "$(P)$(R)LFGateDelay_RBV") +record(ai, "$(P)$(R)LFRepGateWidth_RBV") { field(DTYP, "asynFloat64") - field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_GATE_DELAY") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_REP_GATE_WIDTH") + field(SCAN, "I/O Intr") + field(PREC, "2") +} + +record(ao, "$(P)$(R)LFRepGateDelay") +{ + field(PINI, "YES") + field(DTYP, "asynFloat64") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_REP_GATE_DELAY") + field(PREC, "2") +} + +record(ai, "$(P)$(R)LFRepGateDelay_RBV") +{ + field(DTYP, "asynFloat64") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_REP_GATE_DELAY") + field(SCAN, "I/O Intr") + field(PREC, "2") +} + +record(ao, "$(P)$(R)LFSeqStartGateWidth") +{ + field(PINI, "YES") + field(DTYP, "asynFloat64") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_START_GATE_WIDTH") + field(PREC, "2") +} + +record(ai, "$(P)$(R)LFSeqStartGateWidth_RBV") +{ + field(DTYP, "asynFloat64") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_START_GATE_WIDTH") + field(SCAN, "I/O Intr") + field(PREC, "2") +} + +record(ao, "$(P)$(R)LFSeqStartGateDelay") +{ + field(PINI, "YES") + field(DTYP, "asynFloat64") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_START_GATE_DELAY") + field(PREC, "2") +} + +record(ai, "$(P)$(R)LFSeqStartGateDelay_RBV") +{ + field(DTYP, "asynFloat64") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_START_GATE_DELAY") + field(SCAN, "I/O Intr") + field(PREC, "2") +} + +record(ao, "$(P)$(R)LFSeqEndGateWidth") +{ + field(PINI, "YES") + field(DTYP, "asynFloat64") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_END_GATE_WIDTH") + field(PREC, "2") +} + +record(ai, "$(P)$(R)LFSeqEndGateWidth_RBV") +{ + field(DTYP, "asynFloat64") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_END_GATE_WIDTH") + field(SCAN, "I/O Intr") + field(PREC, "2") +} + +record(ao, "$(P)$(R)LFSeqEndGateDelay") +{ + field(PINI, "YES") + field(DTYP, "asynFloat64") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_END_GATE_DELAY") + field(PREC, "2") +} + +record(ai, "$(P)$(R)LFSeqEndGateDelay_RBV") +{ + field(DTYP, "asynFloat64") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))LF_SEQ_END_GATE_DELAY") field(SCAN, "I/O Intr") field(PREC, "2") } diff --git a/ADApp/Db/LightField_settings.req b/ADApp/Db/LightField_settings.req index 443d6bf..f8720c6 100644 --- a/ADApp/Db/LightField_settings.req +++ b/ADApp/Db/LightField_settings.req @@ -1,5 +1,6 @@ $(P)$(R)NumAccumulations $(P)$(R)NumAcquisitions +$(P)$(R)LFGain $(P)$(R)LFShutterMode $(P)$(R)LFExperimentName $(P)$(R)LFGrating @@ -8,8 +9,16 @@ $(P)$(R)LFEntranceWidth $(P)$(R)LFExitPort $(P)$(R)LFBackgroundFile $(P)$(R)LFBackgroundEnable +$(P)$(R)LFIntensifierEnable +$(P)$(R)LFIntensifierGain $(P)$(R)LFGatingMode $(P)$(R)LFTriggerFrequency -$(P)$(R)LFGateWidth -$(P)$(R)LFGateDelay +$(P)$(R)LFSyncMasterEnable +$(P)$(R)LFSyncMaster2Delay +$(P)$(R)LFRepGateWidth +$(P)$(R)LFRepGateDelay +$(P)$(R)LFSeqStartGateWidth +$(P)$(R)LFSeqStartGateDelay +$(P)$(R)LFSeqEndGateWidth +$(P)$(R)LFSeqEndGateDelay