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

added the confgain parameter of gotthard and changed the MYTHEN part of setsettings that I had commented out earlier

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@62 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2011-11-25 10:10:02 +00:00
parent 05aaefb8f0
commit fdeba63bff
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1791,9 +1791,6 @@ float slsDetector::setDAC(float val, dacIndex index, int imod){
std::cout<< "Set dac/pot/temp failed " << std::endl; std::cout<< "Set dac/pot/temp failed " << std::endl;
} }
return retval; return retval;
}; };
@ -2676,16 +2673,13 @@ detectorSettings slsDetector::setSettings( detectorSettings isettings, int imod)
setModule(*myMod); setModule(*myMod);
} }
} }
//all mods set gain here //setting the gain for the dacs,read from the settings
setDAC(thisDetector->confGain,G_CONF_GAIN); if (thisDetector->myDetectorType==GOTTHARD)
setDAC(thisDetector->confGain,G_CONF_GAIN);
} }
} }
deleteModule(myMod); deleteModule(myMod);
switch(thisDetector->myDetectorType){ switch(thisDetector->myDetectorType==MYTHEN){
case GOTTHARD:
break;
default:
if (thisDetector->correctionMask&(1<<RATE_CORRECTION)) { if (thisDetector->correctionMask&(1<<RATE_CORRECTION)) {
int isett=getSettings(imod); int isett=getSettings(imod);
float t[]=defaultTDead; float t[]=defaultTDead;
@ -5347,6 +5341,22 @@ 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