detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 08:39:21 +01: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
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
git rm bin/$1
git rm -f bin/$1
git add bin/$2

8
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -159,7 +159,7 @@ int initDetector(){
eiger_photonenergy = -1;
setReadOutFlags(NONPARALLEL);
setSpeed(0,1);//clk_devider,half speed
setHighVolage(0,0);
setHighVoltage(0,0);
setIODelay(650,0);
setTiming(AUTO_TIMING);
//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){
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;
}
return eiger_highvoltage;