From 51db5e9d9e81d60af5f60621422cd99b806ddbed Mon Sep 17 00:00:00 2001
From: hammonds <hammonds@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Thu, 12 Aug 2010 19:48:02 +0000
Subject: [PATCH] Add parameters to add randomness to peak array image.

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11322 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/simDetectorMore.adl       | 933 +++++++++++++------------
 ADApp/op/adl/simDetectorPeaksSetup.adl |  50 +-
 2 files changed, 522 insertions(+), 461 deletions(-)

diff --git a/ADApp/op/adl/simDetectorMore.adl b/ADApp/op/adl/simDetectorMore.adl
index 8c6120f..e682ed2 100644
--- a/ADApp/op/adl/simDetectorMore.adl
+++ b/ADApp/op/adl/simDetectorMore.adl
@@ -1,457 +1,476 @@
-
-file {
-	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/simDetector.adl"
-	version=030102
-}
-display {
-	object {
-		x=389
-		y=191
-		width=245
-		height=340
-	}
-	clr=14
-	bclr=4
-	cmap=""
-	gridSpacing=5
-	gridOn=0
-	snapToGrid=0
-}
-"color map" {
-	ncolors=65
-	colors {
-		ffffff,
-		ececec,
-		dadada,
-		c8c8c8,
-		bbbbbb,
-		aeaeae,
-		9e9e9e,
-		919191,
-		858585,
-		787878,
-		696969,
-		5a5a5a,
-		464646,
-		2d2d2d,
-		000000,
-		00d800,
-		1ebb00,
-		339900,
-		2d7f00,
-		216c00,
-		fd0000,
-		de1309,
-		be190b,
-		a01207,
-		820400,
-		5893ff,
-		597ee1,
-		4b6ec7,
-		3a5eab,
-		27548d,
-		fbf34a,
-		f9da3c,
-		eeb62b,
-		e19015,
-		cd6100,
-		ffb0ff,
-		d67fe2,
-		ae4ebc,
-		8b1a96,
-		610a75,
-		a4aaff,
-		8793e2,
-		6a73c1,
-		4d52a4,
-		343386,
-		c7bb6d,
-		b79d5c,
-		a47e3c,
-		7d5627,
-		58340f,
-		99ffff,
-		73dfff,
-		4ea5f9,
-		2a63e4,
-		0a00b8,
-		ebf1b5,
-		d4db9d,
-		bbc187,
-		a6a462,
-		8b8239,
-		73ff6b,
-		52da3b,
-		3cb420,
-		289315,
-		1a7309,
-	}
-}
-text {
-	object {
-		x=8
-		y=6
-		width=228
-		height=25
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Simulation Detector"
-}
-text {
-	object {
-		x=97
-		y=74
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Gains"
-	align="horiz. right"
-}
-text {
-	object {
-		x=84
-		y=32
-		width=84
-		height=25
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="$(P)$(R)"
-	align="horiz. centered"
-}
-"related display" {
-	object {
-		x=92
-		y=308
-		width=60
-		height=20
-	}
-	display[0] {
-		label="Detector control"
-		name="ADBase.adl"
-		args="P=$(P), R=$(R)"
-	}
-	clr=14
-	bclr=51
-}
-"text entry" {
-	object {
-		x=90
-		y=132
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)GainY"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=152
-		y=133
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)GainY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=72
-		y=132
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Y"
-	align="horiz. right"
-}
-text {
-	object {
-		x=72
-		y=107
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="X"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=90
-		y=107
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)GainX"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=152
-		y=108
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)GainX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=42
-		y=157
-		width=40
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Overall"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=90
-		y=157
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)Gain"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=152
-		y=158
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Gain_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=52
-		y=182
-		width=30
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Red"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=90
-		y=182
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)GainRed"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=152
-		y=183
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)GainRed_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=32
-		y=207
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Green"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=90
-		y=207
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)GainGreen"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=152
-		y=208
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)GainGreen_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=42
-		y=232
-		width=40
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Blue"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=90
-		y=232
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)GainBlue"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=152
-		y=233
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)GainBlue_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-rectangle {
-	object {
-		x=5
-		y=69
-		width=235
-		height=195
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-composite {
-	object {
-		x=42
-		y=276
-		width=161
-		height=20
-	}
-	"composite name"=""
-	children {
-		"message button" {
-			object {
-				x=103
-				y=276
-				width=100
-				height=20
-			}
-			control {
-				chan="$(P)$(R)Reset"
-				clr=14
-				bclr=51
-			}
-			label="Reset image"
-			press_msg="1"
-		}
-		text {
-			object {
-				x=42
-				y=276
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Reset"
-			align="horiz. right"
-		}
-	}
-}
+
+file {
+	name="C:\epics\synApps_SVN\support\areaDetector\ADApp\op\adl\simDetectorMore.adl"
+	version=030102
+}
+display {
+	object {
+		x=103
+		y=97
+		width=245
+		height=340
+	}
+	clr=14
+	bclr=4
+	cmap=""
+	gridSpacing=5
+	gridOn=0
+	snapToGrid=0
+}
+"color map" {
+	ncolors=65
+	colors {
+		ffffff,
+		ececec,
+		dadada,
+		c8c8c8,
+		bbbbbb,
+		aeaeae,
+		9e9e9e,
+		919191,
+		858585,
+		787878,
+		696969,
+		5a5a5a,
+		464646,
+		2d2d2d,
+		000000,
+		00d800,
+		1ebb00,
+		339900,
+		2d7f00,
+		216c00,
+		fd0000,
+		de1309,
+		be190b,
+		a01207,
+		820400,
+		5893ff,
+		597ee1,
+		4b6ec7,
+		3a5eab,
+		27548d,
+		fbf34a,
+		f9da3c,
+		eeb62b,
+		e19015,
+		cd6100,
+		ffb0ff,
+		d67fe2,
+		ae4ebc,
+		8b1a96,
+		610a75,
+		a4aaff,
+		8793e2,
+		6a73c1,
+		4d52a4,
+		343386,
+		c7bb6d,
+		b79d5c,
+		a47e3c,
+		7d5627,
+		58340f,
+		99ffff,
+		73dfff,
+		4ea5f9,
+		2a63e4,
+		0a00b8,
+		ebf1b5,
+		d4db9d,
+		bbc187,
+		a6a462,
+		8b8239,
+		73ff6b,
+		52da3b,
+		3cb420,
+		289315,
+		1a7309,
+	}
+}
+text {
+	object {
+		x=96
+		y=23
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Gains"
+	align="horiz. right"
+}
+"related display" {
+	object {
+		x=88
+		y=302
+		width=60
+		height=20
+	}
+	display[0] {
+		label="Detector control"
+		name="ADBase.adl"
+		args="P=$(P), R=$(R)"
+	}
+	clr=14
+	bclr=51
+}
+"text entry" {
+	object {
+		x=89
+		y=81
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)GainY"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=151
+		y=82
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)GainY_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=71
+		y=81
+		width=10
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Y"
+	align="horiz. right"
+}
+text {
+	object {
+		x=71
+		y=56
+		width=10
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="X"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=89
+		y=56
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)GainX"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=151
+		y=57
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)GainX_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=41
+		y=106
+		width=40
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Overall"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=89
+		y=106
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)Gain"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=151
+		y=107
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)Gain_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=51
+		y=131
+		width=30
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Red"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=89
+		y=131
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)GainRed"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=151
+		y=132
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)GainRed_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=31
+		y=156
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Green"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=89
+		y=156
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)GainGreen"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=151
+		y=157
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)GainGreen_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+text {
+	object {
+		x=41
+		y=181
+		width=40
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Blue"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=89
+		y=181
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)GainBlue"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=151
+		y=182
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)GainBlue_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
+rectangle {
+	object {
+		x=4
+		y=18
+		width=235
+		height=195
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
+composite {
+	object {
+		x=38
+		y=270
+		width=161
+		height=20
+	}
+	"composite name"=""
+	children {
+		"message button" {
+			object {
+				x=99
+				y=270
+				width=100
+				height=20
+			}
+			control {
+				chan="$(P)$(R)Reset"
+				clr=14
+				bclr=51
+			}
+			label="Reset image"
+			press_msg="1"
+		}
+		text {
+			object {
+				x=38
+				y=270
+				width=50
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Reset"
+			align="horiz. right"
+		}
+	}
+}
+text {
+	object {
+		x=40
+		y=223
+		width=40
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Noise"
+	align="horiz. right"
+}
+"text entry" {
+	object {
+		x=88
+		y=223
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)Noise"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=150
+		y=224
+		width=61
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)Noise_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	limits {
+	}
+}
diff --git a/ADApp/op/adl/simDetectorPeaksSetup.adl b/ADApp/op/adl/simDetectorPeaksSetup.adl
index 5e40676..7eff5b1 100644
--- a/ADApp/op/adl/simDetectorPeaksSetup.adl
+++ b/ADApp/op/adl/simDetectorPeaksSetup.adl
@@ -371,7 +371,7 @@ text {
 		height=20
 	}
 	monitor {
-		chan="$(P)$(R)PeakStepX"
+		chan="$(P)$(R)PeakStepX_RBV"
 		clr=14
 		bclr=4
 	}
@@ -386,7 +386,7 @@ text {
 		height=20
 	}
 	monitor {
-		chan="$(P)$(R)PeakStepY"
+		chan="$(P)$(R)PeakStepY_RBV"
 		clr=14
 		bclr=4
 	}
@@ -401,7 +401,7 @@ text {
 		height=20
 	}
 	monitor {
-		chan="$(P)$(R)PeakWidthX"
+		chan="$(P)$(R)PeakWidthX_RBV"
 		clr=14
 		bclr=4
 	}
@@ -416,7 +416,49 @@ text {
 		height=20
 	}
 	monitor {
-		chan="$(P)$(R)PeakWidthY"
+		chan="$(P)$(R)PeakWidthY_RBV"
+		clr=14
+		bclr=4
+	}
+	limits {
+	}
+}
+text {
+	object {
+		x=0
+		y=288
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Variation"
+}
+"text entry" {
+	object {
+		x=91
+		y=291
+		width=64
+		height=23
+	}
+	control {
+		chan="$(P)$(R)PeakVariation"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text update" {
+	object {
+		x=179
+		y=288
+		width=49
+		height=20
+	}
+	monitor {
+		chan="$(P)$(R)PeakVariation"
 		clr=14
 		bclr=4
 	}