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

jungfrau server: added storage start, connected auto_comp_disable, changed adcphase, added ADC_PORT_INVERT_VAL, ADC_OFST_HALF_SPEED_VAL, minimum exposure time

Browse Source
This commit is contained in:
maliakal_d
2018-04-13 17:33:46 +02:00
parent e024774323
commit bc70cc3a26
14 changed files with 289 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2072,6 +2072,42 @@ int64_t multiSlsDetector::getTimeLeft(timerIndex index){
int multiSlsDetector::setStoragecellStart(int pos) {
int ret=-100;
if(!threadpool){
cout << "Error in creating threadpool. Exiting" << endl;
return -1;
}else{
//return storage values
int* iret[thisMultiDetector->numberOfDetectors];
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if(detectors[idet]){
iret[idet]= new int(-1);
Task* task = new Task(new func1_t<int,int>(&slsDetector::setStoragecellStart,
detectors[idet],pos,iret[idet]));
threadpool->add_task(task);
}
}
threadpool->startExecuting();
threadpool->wait_for_tasks_to_complete();
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if(detectors[idet]){
if(iret[idet] != NULL){
if (ret==-100)
ret=*iret[idet];
else if (ret!=*iret[idet])
ret=-1;
delete iret[idet];
}else ret=-1;
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
}
}
}
return ret;
}
int multiSlsDetector::setSpeed(speedVariable index, int value){
int i;
int ret1=-100, ret;