detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

added auto comp disable feature

Browse Source
This commit is contained in:
maliakal_d
2018-02-02 18:01:01 +01:00
parent c520f10409
commit 5d04067973
15 changed files with 200 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4595,6 +4595,22 @@ int multiSlsDetector::powerChip(int ival){
}
int multiSlsDetector::setAutoComparatorDisableMode(int ival) {
int ret=OK, ret1=OK;
for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i]) {
ret=detectors[i]->setAutoComparatorDisableMode(ival);
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret==FAIL)
ret1=FAIL;
}
}
return ret1;
}
int multiSlsDetector::loadSettingsFile(string fname, int imod) {
int ret=OK;

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -527,6 +527,12 @@ class multiSlsDetector : public slsDetectorUtils {
*/
int powerChip(int ival= -1);
/** automatic comparator disable for Jungfrau only
\param ival on is 1, off is 0, -1 to get
\returns OK or FAIL
*/
int setAutoComparatorDisableMode(int ival= -1);
/** loads the modules settings/trimbits reading from a file - file name extension is automatically generated! */
int loadSettingsFile(string fname, int nmod=-1);