From fdeba63bffb141051264f2b19613768ae34c8b70 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 25 Nov 2011 10:10:02 +0000
Subject: [PATCH]  added the confgain parameter of gotthard and changed the
 MYTHEN part of setsettings that I had commented out earlier

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@62 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetector/slsDetector.cpp               | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 9b0fd752e..0f1988edc 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -1791,9 +1791,6 @@ float slsDetector::setDAC(float val, dacIndex index, int imod){
     std::cout<< "Set dac/pot/temp failed " << std::endl;
   }
   return retval;
-
-
-
 };
 
 
@@ -2676,16 +2673,13 @@ detectorSettings slsDetector::setSettings( detectorSettings isettings, int imod)
 	  setModule(*myMod);
 	}
       }
-      //all mods set gain here
-      setDAC(thisDetector->confGain,G_CONF_GAIN);
-      
+      //setting the gain for the dacs,read from the settings
+      if (thisDetector->myDetectorType==GOTTHARD)
+	setDAC(thisDetector->confGain,G_CONF_GAIN);
     }
   }
   deleteModule(myMod);
-  switch(thisDetector->myDetectorType){
-  case GOTTHARD:
-    break;
-  default:
+  switch(thisDetector->myDetectorType==MYTHEN){
     if (thisDetector->correctionMask&(1<<RATE_CORRECTION)) {
       int isett=getSettings(imod);
       float t[]=defaultTDead;
@@ -5347,6 +5341,22 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
        sprintf(answer,"%f",setDAC(-1,TEMPERATURE_FPGA));
        return string(answer);
       }
+      /* GOTTHARD CONFGAIN */ 
+      else if (var=="confgain") {
+       if (action==PUT_ACTION) {
+         sscanf(args[1],"%f",&fval);
+         setDAC(fval,G_CONF_GAIN );
+       }
+       int val=setDAC(-1,G_CONF_GAIN);
+       switch(val){
+       case 1:strcpy(answer,"lower gain");break;
+       case 2:strcpy(answer,"medium gain");break;
+       case 3:strcpy(answer,"high gain");break;
+       case 4:strcpy(answer,"very high gain");break;
+       default:strcpy(answer,"Unknown value");break;
+       }
+       return string(answer);
+      }
 
   //timers