From 4d1a392063a2575f40ca3484605fc40b0fab7273 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Sat, 1 Nov 2008 23:13:44 +0000
Subject: [PATCH] Added marCCD

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

diff --git a/ADApp/op/adl/ADTop.adl b/ADApp/op/adl/ADTop.adl
index 3dbdab1..57e3fcf 100644
--- a/ADApp/op/adl/ADTop.adl
+++ b/ADApp/op/adl/ADTop.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/home/epics/devel/areaDetector/1-2/ADApp/op/adl/ADTop.adl"
+	name="/home/epics/devel/areaDetector/1-3beta/ADApp/op/adl/ADTop.adl"
 	version=030102
 }
 display {
 	object {
-		x=24
-		y=46
+		x=92
+		y=30
 		width=301
-		height=255
+		height=300
 	}
 	clr=14
 	bclr=4
@@ -243,70 +243,6 @@ composite {
 		}
 	}
 }
-"related display" {
-	object {
-		x=225
-		y=187
-		width=64
-		height=21
-	}
-	display[0] {
-		label="Pilatus #1 general"
-		name="ADBase.adl"
-		args="P=13PIL1:, R=cam1: "
-	}
-	display[1] {
-		label="Pilatus #1 specific"
-		name="pilatusDetector.adl"
-		args="P=13PIL1:, R=cam1:, ROI=ROI1:, I=image1:"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=47
-		y=187
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Pilatus Drivers"
-}
-"related display" {
-	object {
-		x=225
-		y=213
-		width=64
-		height=21
-	}
-	display[0] {
-		label="Image #1"
-		name="NDStdArrays.adl"
-		args="P=13PIL1:, R=image1:"
-	}
-	display[1] {
-		label="ROI #1"
-		name="NDROI.adl"
-		args="P=13PIL1:, R=ROI1:"
-	}
-	clr=14
-	bclr=51
-}
-text {
-	object {
-		x=37
-		y=213
-		width=80
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Pilatus Plug-ins"
-}
 composite {
 	object {
 		x=47
@@ -402,3 +338,142 @@ text {
 	}
 	textix="Simulator Plug-ins"
 }
+composite {
+	object {
+		x=37
+		y=187
+		width=252
+		height=47
+	}
+	"composite name"=""
+	children {
+		"related display" {
+			object {
+				x=225
+				y=187
+				width=64
+				height=21
+			}
+			display[0] {
+				label="Pilatus #1 general"
+				name="ADBase.adl"
+				args="P=13PIL1:, R=cam1: "
+			}
+			display[1] {
+				label="Pilatus #1 specific"
+				name="pilatusDetector.adl"
+				args="P=13PIL1:, R=cam1:, ROI=ROI1:, I=image1:"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=47
+				y=187
+				width=70
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Pilatus Drivers"
+		}
+		"related display" {
+			object {
+				x=225
+				y=213
+				width=64
+				height=21
+			}
+			display[0] {
+				label="Image #1"
+				name="NDStdArrays.adl"
+				args="P=13PIL1:, R=image1:"
+			}
+			display[1] {
+				label="ROI #1"
+				name="NDROI.adl"
+				args="P=13PIL1:, R=ROI1:"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=37
+				y=213
+				width=80
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Pilatus Plug-ins"
+		}
+	}
+}
+"related display" {
+	object {
+		x=223
+		y=239
+		width=64
+		height=21
+	}
+	display[0] {
+		label="marCCD #1 general"
+		name="ADBase.adl"
+		args="P=13MARCCD1:, R=cam1: "
+	}
+	display[1] {
+		label="marCCD #1 specific"
+		name="marCCD.adl"
+		args="P=13MARCCD1:, R=cam1:, ROI=ROI1:, I=image1:"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=45
+		y=239
+		width=70
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="marCCD Drivers"
+}
+"related display" {
+	object {
+		x=223
+		y=265
+		width=64
+		height=21
+	}
+	display[0] {
+		label="Image #1"
+		name="NDStdArrays.adl"
+		args="P=13MARCCD1:, R=image1:"
+	}
+	display[1] {
+		label="ROI #1"
+		name="NDROI.adl"
+		args="P=13MARCCD1:, R=ROI1:"
+	}
+	clr=14
+	bclr=51
+}
+text {
+	object {
+		x=35
+		y=265
+		width=80
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="marCCD Plug-ins"
+}