detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

gotthard: got rid of confgain as a parameter read from settings file

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@67 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2011-11-28 15:01:02 +00:00
parent cd28aaa350
commit 145de52af3
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2750,9 +2750,6 @@ detectorSettings slsDetector::setSettings( detectorSettings isettings, int imod)
setModule(*myMod); setModule(*myMod);
} }
} }
//setting the gain for the dacs,read from the settings
if (thisDetector->myDetectorType==GOTTHARD)
setDAC(thisDetector->confGain,G_CONF_GAIN);
} }
} }
deleteModule(myMod); deleteModule(myMod);
@ -5728,22 +5725,6 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
sprintf(answer,"%f",setDAC(-1,TEMPERATURE_FPGA)); sprintf(answer,"%f",setDAC(-1,TEMPERATURE_FPGA));
return string(answer); 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 //timers

7
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -311,13 +311,10 @@ typedef struct sharedSlsDetector {
/*extra gotthard members*/ /*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]; 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]; char clientMacAddress[MAX_STR_LENGTH];
/** gain for gotthard read from settings file**/
int confGain;
} sharedSlsDetector; } sharedSlsDetector;