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

slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit

Browse Source
This commit is contained in:
maliakal_d
2018-08-10 19:14:05 +02:00
parent c934e92a41
commit 0018fa46f8
19 changed files with 282 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2290,6 +2290,56 @@ int multiSlsDetector::stopAcquisition() {
}
int multiSlsDetector::sendSoftwareTrigger() {
int i = 0;
int ret = OK;
int posmin = 0, posmax = detectors.size();
if (!threadpool) {
cout << "Error in creating threadpool. Exiting" << endl;
return FAIL;
} else {
int* iret[posmax - posmin];
for (int idet = posmin; idet < posmax; ++idet) {
if (idet != thisMultiDetector->masterPosition) {
iret[idet] = new int(OK);
Task* task = new Task(new func0_t<int>(&slsDetector::sendSoftwareTrigger,
detectors[idet], iret[idet]));
threadpool->add_task(task);
}
}
threadpool->startExecuting();
threadpool->wait_for_tasks_to_complete();
for (int idet = posmin; idet < posmax; ++idet) {
if (idet != thisMultiDetector->masterPosition) {
if (iret[idet] != NULL) {
if (*iret[idet] != OK)
ret = FAIL;
delete iret[idet];
} else
ret = FAIL;
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
}
}
}
//master
int ret1 = OK;
i = thisMultiDetector->masterPosition;
if (thisMultiDetector->masterPosition >= 0) {
ret1 = detectors[i]->sendSoftwareTrigger();
if (detectors[i]->getErrorMask())
setErrorMask(getErrorMask() | (1 << i));
if (ret1 != OK)
ret = FAIL;
}
return ret;
}
int multiSlsDetector::startReadOut() {
unsigned int i = 0;
int ret = OK, ret1 = OK;

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -945,6 +945,12 @@ public:
*/
int stopAcquisition();
/**
* Give an internal software trigger to the detector (Eiger only)
* @return OK or FAIL
*/
int sendSoftwareTrigger();
/**
* Start readout (without exposure or interrupting exposure) (Mythen)
* @returns OK or FAIL