mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-12-29 15:41:18 +01:00
resolved conflicts in merging with release
This commit is contained in:
@@ -2217,7 +2217,6 @@ dacs_t slsDetector::setDAC(dacs_t val, dacIndex index, int mV, int imod){
|
||||
char mess[100];
|
||||
int arg[3];
|
||||
|
||||
|
||||
if ( (thisDetector->myDetectorType != GOTTHARD) && (thisDetector->myDetectorType != PROPIX) && index==HV_POT)
|
||||
index=HV_NEW;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user