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

reset fpga implemented, changed receiver configuration warning prints, powerchip implemented

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-03 12:31:34 +01:00
parent 0aecad6644
commit 4b99ff7fbe
14 changed files with 501 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -3965,7 +3965,7 @@ int multiSlsDetector::programFPGA(string fname){
ret=detectors[i]->programFPGA(fname);
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret!=OK)
if (ret==FAIL)
ret1=FAIL;
}
}
@@ -3974,6 +3974,39 @@ int multiSlsDetector::programFPGA(string fname){
int multiSlsDetector::resetFPGA(){
int ret=OK, ret1=OK;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]) {
ret=detectors[i]->resetFPGA();
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret==FAIL)
ret1=FAIL;
}
}
return ret1;
}
int multiSlsDetector::powerChip(int ival){
int ret=OK, ret1=OK;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]) {
ret=detectors[i]->powerChip(ival);
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret==FAIL)
ret1=FAIL;
}
}
return ret1;
}
int multiSlsDetector::loadSettingsFile(string fname, int imod) {
int id, im, ret=OK;