diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.18 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19 similarity index 67% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.18 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19 index 8612c3cb5..bc6cc8ea3 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.18 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv1.11.19 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/renameServer.sh b/slsDetectorSoftware/eigerDetectorServer/renameServer.sh index a3745d4a3..9aca06728 100644 --- a/slsDetectorSoftware/eigerDetectorServer/renameServer.sh +++ b/slsDetectorSoftware/eigerDetectorServer/renameServer.sh @@ -1,3 +1,3 @@ mv bin/eigerDetectorServer bin/$2 -git rm bin/$1 +git rm -f bin/$1 git add bin/$2 diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index a10cd7e01..4e506b1cf 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -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; diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h index f4313e6b0..8a083e5c0 100644 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h @@ -41,7 +41,7 @@ int getADC(enum detDacIndex ind, int imod); #if defined(EIGERD) || defined(GOTTHARD) -int setHighVolage(int val, int imod); +int setHighVoltage(int val, int imod); #endif #ifdef EIGERD diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 0d43281bd..63ae05e4a 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1197,7 +1197,7 @@ int set_dac(int file_des) { case E_Vis: idac = VIS; break; - case HV_POT: + case HV_NEW: break; case IO_DELAY: break; @@ -1217,8 +1217,8 @@ int set_dac(int file_des) { ret=FAIL; sprintf(mess,"Detector locked by %s\n",lastClientIP); } else{ - if(ind == HV_POT) - retval[0] = setHighVolage(val,imod); + if((ind == HV_POT) ||(ind == HV_NEW)) + retval[0] = setHighVoltage(val,imod); else if(ind == IO_DELAY) retval[0] = setIODelay(val,imod); else