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

fixed high voltage index and bottom high voltage problem in server

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-03-09 11:24:36 +01:00
parent 7ace569daf
commit b9e2a11adf
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.18 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19
View File

Binary file not shown.

2
slsDetectorSoftware/eigerDetectorServer/renameServer.sh
View File

@ -1,3 +1,3 @@
mv bin/eigerDetectorServer bin/$2 mv bin/eigerDetectorServer bin/$2
git rm bin/$1 git rm -f bin/$1
git add bin/$2 git add bin/$2

8
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -159,7 +159,7 @@ int initDetector(){
eiger_photonenergy = -1; eiger_photonenergy = -1;
setReadOutFlags(NONPARALLEL); setReadOutFlags(NONPARALLEL);
setSpeed(0,1);//clk_devider,half speed setSpeed(0,1);//clk_devider,half speed
setHighVolage(0,0); setHighVoltage(0,0);
setIODelay(650,0); setIODelay(650,0);
setTiming(AUTO_TIMING); setTiming(AUTO_TIMING);
//SetPhotonEnergyCalibrationParameters(-5.8381e-5,1.838515,5.09948e-7,-4.32390e-11,1.32527e-15); //SetPhotonEnergyCalibrationParameters(-5.8381e-5,1.838515,5.09948e-7,-4.32390e-11,1.32527e-15);
@ -418,10 +418,12 @@ void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]){
} }
int setHighVolage(int val, int imod){ int setHighVoltage(int val, int imod){
if(val!=-1){ if(val!=-1){
printf(" Setting High Voltage: %d\n",val); printf(" Setting High Voltage: %d\n",val);
if(Feb_Control_SetHighVoltage(val)) if(!top)
eiger_highvoltage = val;
else if(Feb_Control_SetHighVoltage(val))
eiger_highvoltage = val; eiger_highvoltage = val;
} }
return eiger_highvoltage; return eiger_highvoltage;

2
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -41,7 +41,7 @@ int getADC(enum detDacIndex ind, int imod);
#if defined(EIGERD) || defined(GOTTHARD) #if defined(EIGERD) || defined(GOTTHARD)
int setHighVolage(int val, int imod); int setHighVoltage(int val, int imod);
#endif #endif
#ifdef EIGERD #ifdef EIGERD

6
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1197,7 +1197,7 @@ int set_dac(int file_des) {
case E_Vis: case E_Vis:
idac = VIS; idac = VIS;
break; break;
case HV_POT: case HV_NEW:
break; break;
case IO_DELAY: case IO_DELAY:
break; break;
@ -1217,8 +1217,8 @@ int set_dac(int file_des) {
ret=FAIL; ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP); sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else{ } else{
if(ind == HV_POT) if((ind == HV_POT) ||(ind == HV_NEW))
retval[0] = setHighVolage(val,imod); retval[0] = setHighVoltage(val,imod);
else if(ind == IO_DELAY) else if(ind == IO_DELAY)
retval[0] = setIODelay(val,imod); retval[0] = setIODelay(val,imod);
else else