diff --git a/slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c b/slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c index a9cc24485..18e8c5239 100644 --- a/slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c +++ b/slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c @@ -23,7 +23,7 @@ const char* dac_names[16] = {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","V -/** Ian, the setdac and getdac should take float if it takes only V and not mV*/ + int eiger_nexposures = 1; int EigerGetNumberOfExposures(){return eiger_nexposures;} float eiger_exposuretime = 1; diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 80479fd01..86708b513 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer differ diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index d1d808854..39295b347 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -153,9 +153,9 @@ int setDAC(enum detDacIndex ind, int val, int imod){ printf("Getting dac %d: %s\n",ind, iname); //#endif if(val >= 0) - EigerSetDAC(iname,val/1000); + EigerSetDAC(iname,val); - return (EigerGetDAC(iname)*1000); + return EigerGetDAC(iname); }