diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 36f417ff0..49d28f6ba 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -2750,9 +2750,6 @@ detectorSettings slsDetector::setSettings( detectorSettings isettings, int imod) setModule(*myMod); } } - //setting the gain for the dacs,read from the settings - if (thisDetector->myDetectorType==GOTTHARD) - setDAC(thisDetector->confGain,G_CONF_GAIN); } } deleteModule(myMod); @@ -5728,22 +5725,6 @@ 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 diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 8a069dacb..f00d5d78b 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -311,13 +311,10 @@ typedef struct sharedSlsDetector { /*extra gotthard members*/ - /** is the ip address of the client for gotthard; read from settings file **/ + /** is the ip address of the client for gotthard; read from configuration file **/ char clientIPAddress[MAX_STR_LENGTH]; - /** is the mac address of the client for gotthard; read from settings file **/ + /** is the mac address of the client for gotthard; read from configuration file **/ char clientMacAddress[MAX_STR_LENGTH]; - /** gain for gotthard read from settings file**/ - int confGain; - } sharedSlsDetector;