From 8629ef0c3fd678a3e63a39eda1f78d64c27457b8 Mon Sep 17 00:00:00 2001 From: hammonds Date: Thu, 12 Aug 2010 19:45:40 +0000 Subject: [PATCH] Add parameters to add randomness to peak array image. git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11321 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/Db/simDetector.template | 37 +++++++++++++++++++++++++++++++ ADApp/Db/simDetector_settings.req | 2 ++ 2 files changed, 39 insertions(+) diff --git a/ADApp/Db/simDetector.template b/ADApp/Db/simDetector.template index 2480c9c..5a14ce4 100644 --- a/ADApp/Db/simDetector.template +++ b/ADApp/Db/simDetector.template @@ -95,6 +95,21 @@ record(longin, "$(P)$(R)Reset_RBV") field(SCAN, "I/O Intr") } +record(longout, "$(P)$(R)Noise") +{ + field(PINI, "YES") + field(DTYP, "asynInt32") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_NOISE") +} + +record(longin, "$(P)$(R)Noise_RBV") +{ + field(DTYP, "asynInt32") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_NOISE") + field(SCAN, "I/O Intr") +} + + # Redefine the color mode choices from ADBase.template to only have those that the simDetector # driver supports. Keep the same values (xxVL), but change the menu numbers. @@ -183,6 +198,7 @@ record(mbbi, "$(P)$(R)ImageType_RBV") # Channels for Peaks Image Type record(longout, "$(P)$(R)PeakStartX") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_START_X") } @@ -196,6 +212,7 @@ record(longin, "$(P)$(R)PeakStartX_RBV") record(longout, "$(P)$(R)PeakStartY") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_START_Y") } @@ -209,6 +226,7 @@ record(longin, "$(P)$(R)PeakStartY_RBV") record(longout, "$(P)$(R)PeakNumX") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_NUM_X") } @@ -222,6 +240,7 @@ record(longin, "$(P)$(R)PeakNumX_RBV") record(longout, "$(P)$(R)PeakNumY") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_NUM_Y") } @@ -235,6 +254,7 @@ record(longin, "$(P)$(R)PeakNumY_RBV") record(longout, "$(P)$(R)PeakStepX") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_STEP_X") } @@ -248,6 +268,7 @@ record(longin, "$(P)$(R)PeakStepX_RBV") record(longout, "$(P)$(R)PeakStepY") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_STEP_Y") } @@ -261,6 +282,7 @@ record(longin, "$(P)$(R)PeakStepY_RBV") record(longout, "$(P)$(R)PeakWidthX") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_WIDTH_X") } @@ -274,6 +296,7 @@ record(longin, "$(P)$(R)PeakWidthX_RBV") record(longout, "$(P)$(R)PeakWidthY") { + field(PINI, "YES") field(DTYP, "asynInt32") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_WIDTH_Y") } @@ -285,3 +308,17 @@ record(longin, "$(P)$(R)PeakWidthY_RBV") field(SCAN, "I/O Intr") } +record(longout, "$(P)$(R)PeakVariation") +{ + field(PINI, "YES") + field(DTYP, "asynInt32") + field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_HEIGHT_VARIATION") +} + +record(longin, "$(P)$(R)PeakVariation_RBV") +{ + field(DTYP, "asynInt32") + field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SIM_PEAK_HEIGHT_VARIATION") + field(SCAN, "I/O Intr") +} + diff --git a/ADApp/Db/simDetector_settings.req b/ADApp/Db/simDetector_settings.req index 06d5f2f..147addb 100644 --- a/ADApp/Db/simDetector_settings.req +++ b/ADApp/Db/simDetector_settings.req @@ -12,4 +12,6 @@ $(P)$(R)PeakStepX $(P)$(R)PeakStepY $(P)$(R)PeakWidthX $(P)$(R)PeakWidthY +$(P)$(R)PeakVariation +$(P)$(R)Noise