From 4ac8da9c401d650311686b97a5afd8201cf36a7e Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Sat, 23 Aug 2008 14:55:02 +0000
Subject: [PATCH] Added Pilatus detecotr

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7524 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/ADTop.adl | 419 ++++++++++++++++++++++++++---------------
 1 file changed, 269 insertions(+), 150 deletions(-)

diff --git a/ADApp/op/adl/ADTop.adl b/ADApp/op/adl/ADTop.adl
index de4c516..b756f3a 100644
--- a/ADApp/op/adl/ADTop.adl
+++ b/ADApp/op/adl/ADTop.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/srv/vxwfs/app/areaDetector-head/ADApp/op/adl/ADTop.adl"
-	version=030102
+	name="/home/epics/devel/areaDetector/1-2/ADApp/op/adl/ADTop.adl"
+	version=030000
 }
 display {
 	object {
-		x=37
-		y=199
-		width=300
-		height=195
+		x=31
+		y=131
+		width=301
+		height=255
 	}
 	clr=14
 	bclr=4
@@ -92,200 +92,319 @@ text {
 		x=50
 		y=6
 		width=201
-		height=30
+		height=31
 	}
 	"basic attribute" {
 		clr=14
 	}
 	textix="Area Detector"
 }
+composite {
+	object {
+		x=47
+		y=54
+		width=242
+		height=21
+	}
+	"composite name"=""
+	children {
+		"related display" {
+			object {
+				x=225
+				y=54
+				width=64
+				height=21
+			}
+			display[0] {
+				label="Simulator #1 General"
+				name="ADBase.adl"
+				args="P=13SIM1:, R=cam1:"
+			}
+			display[1] {
+				label="Simulator #1 Specific"
+				name="simDetector.adl"
+				args="P=13SIM1:, R=cam1:"
+			}
+			display[2] {
+				label="Simulator #2 General"
+				name="ADBase.adl"
+				args="P=13SIM1:, R=cam2:"
+			}
+			display[3] {
+				label="Simulator #2 Specific"
+				name="simDetector.adl"
+				args="P=13SIM1:, R=cam2:"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=47
+				y=54
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Simulator Drivers"
+		}
+	}
+}
+composite {
+	object {
+		x=47
+		y=107
+		width=242
+		height=21
+	}
+	"composite name"=""
+	children {
+		"related display" {
+			object {
+				x=225
+				y=107
+				width=64
+				height=21
+			}
+			display[0] {
+				label="Prosilica #1 general"
+				name="ADBase.adl"
+				args="P=13PS1:, R=cam1:"
+			}
+			display[1] {
+				label="Prosilica #1 specific"
+				name="prosilica.adl"
+				args="P=13PS1:, R=cam1:"
+			}
+			display[2] {
+				label="Prosilica #2 general"
+				name="ADBase.adl"
+				args="P=13PS1:, R=cam2:"
+			}
+			display[3] {
+				label="Prosilica #2 specific"
+				name="prosilica.adl"
+				args="P=13PS1:, R=cam2:"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=47
+				y=107
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Prosilica Drivers"
+		}
+	}
+}
+composite {
+	object {
+		x=47
+		y=160
+		width=242
+		height=21
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=47
+				y=160
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="ADSC Drivers"
+		}
+		"related display" {
+			object {
+				x=225
+				y=160
+				width=64
+				height=21
+			}
+			display[0] {
+				label="ADSC general"
+				name="ADBase.adl"
+				args="P=13ADSC1:, R=det1:"
+			}
+			display[1] {
+				label="ADSC specific"
+				name="adsc.adl"
+				args="P=13ADSC1:, R=det1:"
+			}
+			clr=14
+			bclr=51
+		}
+	}
+}
+composite {
+	object {
+		x=37
+		y=81
+		width=252
+		height=21
+	}
+	"composite name"=""
+	children {
+		"related display" {
+			object {
+				x=225
+				y=81
+				width=64
+				height=21
+			}
+			display[0] {
+				label="Image #1"
+				name="NDStdArrays.adl"
+				args="P=13SIM1:, R=image1:"
+			}
+			display[1] {
+				label="File #1"
+				name="NDFile.adl"
+				args="P=13SIM1:, R=file1:"
+			}
+			display[2] {
+				label="ROI #1"
+				name="NDROI.adl"
+				args="P=13SIM1:, R=ROI1:"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=37
+				y=81
+				width=80
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Simulator Plug-ins"
+		}
+	}
+}
+composite {
+	object {
+		x=37
+		y=134
+		width=252
+		height=21
+	}
+	"composite name"=""
+	children {
+		"related display" {
+			object {
+				x=225
+				y=134
+				width=64
+				height=21
+			}
+			display[0] {
+				label="Image #1"
+				name="NDStdArrays.adl"
+				args="P=13PS1:, R=image1:"
+			}
+			display[1] {
+				label="File #1"
+				name="NDFile.adl"
+				args="P=13PS1:, R=file1:"
+			}
+			display[2] {
+				label="ROI #1"
+				name="NDROI.adl"
+				args="P=13PS1:, R=ROI1:"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=37
+				y=134
+				width=80
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Prosilica Plug-ins"
+		}
+	}
+}
 "related display" {
 	object {
-		x=220
-		y=53
+		x=225
+		y=187
 		width=64
 		height=21
 	}
 	display[0] {
-		label="Simulator #1 General"
+		label="Pilatus #1 general"
 		name="ADBase.adl"
-		args="P=13SIM1:, R=cam1:"
+		args="P=13PIL1:, R=cam1: "
 	}
 	display[1] {
-		label="Simulator #1 Specific"
-		name="simDetector.adl"
-		args="P=13SIM1:, R=cam1:"
-	}
-	display[2] {
-		label="Simulator #2 General"
-		name="ADBase.adl"
-		args="P=13SIM1:, R=cam2:"
-	}
-	display[3] {
-		label="Simulator #2 Specific"
-		name="simDetector.adl"
-		args="P=13SIM1:, R=cam2:"
+		label="Pilatus #1 specific"
+		name="pilatusDetector.adl"
+		args="P=13PIL1:, R=cam1:, ROI=ROI1:, I=image1:"
 	}
 	clr=14
 	bclr=51
 }
 text {
 	object {
-		x=42
-		y=53
+		x=47
+		y=187
 		width=70
 		height=20
 	}
 	"basic attribute" {
 		clr=14
 	}
-	textix="Simulator Drivers"
+	textix="Pilatus Drivers"
 }
 "related display" {
 	object {
-		x=220
-		y=79
-		width=64
-		height=21
-	}
-	display[0] {
-		label="Prosilica #1 general"
-		name="ADBase.adl"
-		args="P=13PS1:, R=cam1:"
-	}
-	display[1] {
-		label="Prosilica #1 specific"
-		name="prosilica.adl"
-		args="P=13PS1:, R=cam1:"
-	}
-	display[2] {
-		label="Prosilica #2 general"
-		name="ADBase.adl"
-		args="P=13PS1:, R=cam2:"
-	}
-	display[3] {
-		label="Prosilica #2 specific"
-		name="prosilica.adl"
-		args="P=13PS1:, R=cam2:"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=42
-		y=79
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Prosilica Drivers"
-}
-"related display" {
-	object {
-		x=220
-		y=131
+		x=225
+		y=213
 		width=64
 		height=21
 	}
 	display[0] {
 		label="Image #1"
 		name="NDStdArrays.adl"
-		args="P=13SIM1:, R=image1:"
+		args="P=13PIL1:, R=image1:"
 	}
 	display[1] {
-		label="File #1"
-		name="NDFile.adl"
-		args="P=13SIM1:, R=file1:"
-	}
-	display[2] {
 		label="ROI #1"
 		name="NDROI.adl"
-		args="P=13SIM1:, R=ROI1:"
+		args="P=13PIL1:, R=ROI1:"
 	}
 	clr=14
 	bclr=51
 }
 text {
 	object {
-		x=32
-		y=131
+		x=37
+		y=213
 		width=80
 		height=20
 	}
 	"basic attribute" {
 		clr=14
 	}
-	textix="Simulator Plug-ins"
-}
-"related display" {
-	object {
-		x=220
-		y=157
-		width=64
-		height=21
-	}
-	display[0] {
-		label="Image #1"
-		name="NDStdArrays.adl"
-		args="P=13PS1:, R=image1:"
-	}
-	display[1] {
-		label="File #1"
-		name="NDFile.adl"
-		args="P=13PS1:, R=file1:"
-	}
-	display[2] {
-		label="ROI #1"
-		name="NDROI.adl"
-		args="P=13PS1:, R=ROI1:"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=32
-		y=157
-		width=80
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Prosilica Plug-ins"
-}
-text {
-	object {
-		x=42
-		y=105
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="ADSC Drivers"
-}
-"related display" {
-	object {
-		x=220
-		y=105
-		width=64
-		height=21
-	}
-	display[0] {
-		label="ADSC general"
-		name="ADBase.adl"
-		args="P=13ADSC1:, R=det1:"
-	}
-	display[1] {
-		label="ADSC specific"
-		name="adsc.adl"
-		args="P=13ADSC1:, R=det1:"
-	}
-	clr=14
-	bclr=51
+	textix="Pilatus Plug-ins"
 }