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

gotthard a few changes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@65 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2011-11-28 12:52:47 +00:00
parent 4cbd9b2265
commit 57b892267a
4 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -855,9 +855,6 @@ int set_dac(int fnum) {
case HV_POT:
ireg=HIGH_VOLTAGE;
break;
case G_CONF_GAIN:
ireg=CONFGAIN;
break;
default:
printf("Unknown DAC/TEMP/HV index %d\n",ind);
sprintf(mess,"Unknown DAC/TEMP/HV index %d\n",ind);
@ -869,11 +866,8 @@ int set_dac(int fnum) {
if(ireg==-1)
retval=initDACbyIndexDACU(idac,val,imod);
else
{//Conf gain
if (ireg==CONFGAIN)
retval=initConfGainByModule(val,imod);
//HV or conf gain
else if(ireg==HIGH_VOLTAGE)
{ //HV or conf gain
if(ireg==HIGH_VOLTAGE)
retval=initHighVoltageByModule(val,imod);
//Temp
else
@ -885,7 +879,7 @@ int set_dac(int fnum) {
printf("DAC/TEMP/HV set to %f V\n", retval);
#endif
ret=FAIL;
if((ireg==HIGH_VOLTAGE)||(ireg==CONFGAIN)){
if(ireg==HIGH_VOLTAGE){
if(retval==-2)
strcpy(mess,"Invalid Voltage.Valid values are 0,90,110,120,150,180,200");
else if(retval==-3)
@ -1326,6 +1320,7 @@ int set_module(int fnum) {
if (ret==OK) {
#ifdef MCB_FUNCS
retval=initModulebyNumber(myModule);
#endif
}