Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detector_software into release

This commit is contained in:
Dhanya Maliakal
2016-02-24 18:05:39 +01:00
5 changed files with 282 additions and 401 deletions

View File

@ -2216,6 +2216,11 @@ dacs_t slsDetector::setDAC(dacs_t val, dacIndex index, int mV, int imod){
int ret=FAIL;
char mess[100];
int arg[3];
if ( (thisDetector->myDetectorType != GOTTHARD) && (thisDetector->myDetectorType != PROPIX) && index==HV_POT)
index=HV_NEW;
arg[0]=index;
arg[1]=imod;
arg[2]=mV;