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

merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch

Browse Source
This commit is contained in:
maliakal_d
2017-10-12 14:42:57 +02:00
parent 0f302e3446 fe6e1c8868
commit 311059d748
11 changed files with 103 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -346,6 +346,11 @@ int slsDetectorUsers::startAcquisition() {
return myDetector->startAcquisition();
}
int slsDetectorUsers::stopAcquisition() {
return myDetector->stopAcquisition();
}
int slsDetectorUsers::setReceiverSilentMode(int i) {
return myDetector->setReceiverSilentMode(i);
}

10
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -598,11 +598,19 @@ class slsDetectorUsers
int stopReceiver();
/**
start detector acquisition in non blocking mode
start detector real time acquisition in non blocking mode
does not include scans, scripts, incrementing file index, s
tarting/stopping receiver, resetting frames caught in receiver
\returns OK if all detectors are properly started, FAIL otherwise
*/
int startAcquisition();
/**
stop detector real time acquisition
\returns OK if all detectors are properly started, FAIL otherwise
*/
int stopAcquisition();
/**
* set receiver in silent mode
* @param i 1 sets, 0 unsets (-1 gets)