mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-24 23:30:03 +02:00
resolved conflicts in merging with release
This commit is contained in:
parent
5b3aa45439
commit
7ace569daf
@ -2217,6 +2217,7 @@ 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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user