detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-03-13 07:37:42 +01:00
Code Issues Actions Packages Releases Activity

fix for corrupt merge

Browse Source
This commit is contained in:
maliakal_d
2019-04-29 11:30:19 +02:00
parent 06d4c7ce37
commit 668cff1c65
3 changed files with 162 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@@ -5562,13 +5562,13 @@ std::string slsDetectorCommand::cmdPattern(int narg, char *args[], int action, i
return std::string("Could not scan adcdisable reg ") + std::string(args[1]);
// get enable mask from enable mask
adcEnableMask ^= 0xFFFFFFFF;
adcEnableMask ^= BIT32_MASK;
myDet->setADCEnableMask(adcEnableMask, detPos);
}
uint32_t retval = myDet->getADCEnableMask(detPos);
// get disable mask
retval ^= 0xFFFFFFFF;
retval ^= BIT32_MASK;
os << std::hex << retval << std::dec;
}