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

two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-11-20 16:28:48 +01:00
parent a1bd54b16b
commit c097dfc8b3
18 changed files with 474 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -321,9 +321,9 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
reads the encoder (iof required for angualr conversion) <br>
processes the data (flat field, rate, angular conversion and merging ::processData())
\param delflag 0 leaves the data in the final data queue (default is 1)
\returns nothing
\returns OK or FAIL depending on if it already started
*/
virtual void acquire(int delflag=1)=0;
virtual int acquire(int delflag=1)=0;
int startMeasurement(){acquire(0); return OK;};