From 09ef669f1781d426660e7994c0271dfe927b764b Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@08cae9ef-cb74-4d14-b03a-d7ea46f178d7>
Date: Thu, 13 Oct 2011 11:41:48 +0000
Subject: [PATCH] Gotthard software added to MAkefile and settings directory

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@2 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
---
 Makefile                            | 11 ++++++++---
 settings/dynamicgain/calibration.sn |  1 +
 settings/dynamicgain/settings.sn    | 10 ++++++++++
 settings/gain1/calibration.sn       |  1 +
 settings/gain1/settings.sn          | 10 ++++++++++
 settings/gain2/calibration.sn       |  1 +
 settings/gain2/settings.sn          | 10 ++++++++++
 settings/gain3/calibration.sn       |  1 +
 settings/gain3/settings.sn          | 10 ++++++++++
 settings/highgain/calibration.sn    |  1 +
 settings/highgain/settings.sn       | 10 ++++++++++
 11 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100755 settings/dynamicgain/calibration.sn
 create mode 100755 settings/dynamicgain/settings.sn
 create mode 100755 settings/gain1/calibration.sn
 create mode 100755 settings/gain1/settings.sn
 create mode 100755 settings/gain2/calibration.sn
 create mode 100755 settings/gain2/settings.sn
 create mode 100755 settings/gain3/calibration.sn
 create mode 100755 settings/gain3/settings.sn
 create mode 100755 settings/highgain/calibration.sn
 create mode 100755 settings/highgain/settings.sn

diff --git a/Makefile b/Makefile
index 481de7f66..562c1dbe6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,12 @@
 WD=$(shell pwd)
 LIBRARYDIR=$(WD)/slsDetectorSoftware
 TLIBRARYDIR=$(WD)/TMythenDetector
-CLIENTDIR=$(WD)/mythenClient
+CLIENTDIR=$(WD)/slsDetectorClient
 GUIDIR=$(WD)/mythenGUI
 LIBDOCDIR=$(WD)/slsDetectorSoftware
 
 
-all: lib mythenClient mythenGUI 
+all: lib mythenClient gotthardClient mythenGUI 
 
 
 lib:
@@ -20,7 +20,11 @@ Tlib:
 	cd $(TLIBRARYDIR) && $(MAKE) lib
 
 mythenClient: lib
-	cd $(CLIENTDIR) && $(MAKE)
+	cd $(CLIENTDIR) && $(MAKE) mythen
+	mv $(CLIENTDIR)/bin/* bin/
+
+gotthardClient: lib
+	cd $(CLIENTDIR) && $(MAKE) gotthard
 	mv $(CLIENTDIR)/bin/* bin/
 
 mythenGUI: lib Tlib 
@@ -88,6 +92,7 @@ help:
 	@echo "make lib           	compile library"
 	@echo "make tlib           	compile Root/Qt library"
 	@echo "make mythenClient  	compile mythenClient"
+	@echo "make gotthardClient  	compile gotthardClient"
 	@echo "make mythenGUI	   	compile mythenGUI"
 	@echo "make install_client     install mythenClient"
 	@echo "make install_gui        install mythenGUI"
diff --git a/settings/dynamicgain/calibration.sn b/settings/dynamicgain/calibration.sn
new file mode 100755
index 000000000..e5a59be31
--- /dev/null
+++ b/settings/dynamicgain/calibration.sn
@@ -0,0 +1 @@
+227 5.6
diff --git a/settings/dynamicgain/settings.sn b/settings/dynamicgain/settings.sn
new file mode 100755
index 000000000..9153a8e89
--- /dev/null
+++ b/settings/dynamicgain/settings.sn
@@ -0,0 +1,10 @@
+VREF_DS 300
+VCASCN_PB 320
+VCASCP_PB 340
+VOUT_CM 360
+VCASC_OUT 380
+VIN_CM 400
+VREF_COMP 420
+IB_TESTC 440
+config 0x07
+hv 100
\ No newline at end of file
diff --git a/settings/gain1/calibration.sn b/settings/gain1/calibration.sn
new file mode 100755
index 000000000..e5a59be31
--- /dev/null
+++ b/settings/gain1/calibration.sn
@@ -0,0 +1 @@
+227 5.6
diff --git a/settings/gain1/settings.sn b/settings/gain1/settings.sn
new file mode 100755
index 000000000..402a5fa2a
--- /dev/null
+++ b/settings/gain1/settings.sn
@@ -0,0 +1,10 @@
+VREF_DS 400
+VCASCN_PB 420
+VCASCP_PB 440
+VOUT_CM 460
+VCASC_OUT 480
+VIN_CM 500
+VREF_COMP 520
+IB_TESTC 540
+config 0x07
+hv 100
\ No newline at end of file
diff --git a/settings/gain2/calibration.sn b/settings/gain2/calibration.sn
new file mode 100755
index 000000000..e5a59be31
--- /dev/null
+++ b/settings/gain2/calibration.sn
@@ -0,0 +1 @@
+227 5.6
diff --git a/settings/gain2/settings.sn b/settings/gain2/settings.sn
new file mode 100755
index 000000000..58d3e5c22
--- /dev/null
+++ b/settings/gain2/settings.sn
@@ -0,0 +1,10 @@
+VREF_DS 500
+VCASCN_PB 520
+VCASCP_PB 540
+VOUT_CM 560
+VCASC_OUT 580
+VIN_CM 600
+VREF_COMP 620
+IB_TESTC 640
+config 0x07
+hv 100
\ No newline at end of file
diff --git a/settings/gain3/calibration.sn b/settings/gain3/calibration.sn
new file mode 100755
index 000000000..e5a59be31
--- /dev/null
+++ b/settings/gain3/calibration.sn
@@ -0,0 +1 @@
+227 5.6
diff --git a/settings/gain3/settings.sn b/settings/gain3/settings.sn
new file mode 100755
index 000000000..bdadcc2e6
--- /dev/null
+++ b/settings/gain3/settings.sn
@@ -0,0 +1,10 @@
+VREF_DS 600
+VCASCN_PB 620
+VCASCP_PB 640
+VOUT_CM 660
+VCASC_OUT 680
+VIN_CM 700
+VREF_COMP 720
+IB_TESTC 740
+config 0x07
+hv 100
\ No newline at end of file
diff --git a/settings/highgain/calibration.sn b/settings/highgain/calibration.sn
new file mode 100755
index 000000000..e5a59be31
--- /dev/null
+++ b/settings/highgain/calibration.sn
@@ -0,0 +1 @@
+227 5.6
diff --git a/settings/highgain/settings.sn b/settings/highgain/settings.sn
new file mode 100755
index 000000000..8d922cfaa
--- /dev/null
+++ b/settings/highgain/settings.sn
@@ -0,0 +1,10 @@
+VREF_DS 200
+VCASCN_PB 220
+VCASCP_PB 240
+VOUT_CM 260
+VCASC_OUT 280
+VIN_CM 300
+VREF_COMP 320
+IB_TESTC 340
+config 0x07
+hv 100
\ No newline at end of file