detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17: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

20
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -405,10 +405,10 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
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
\returns nothing
\returns OK or FAIL depending on if it already started
*/
void acquire(int delflag=1);
int acquire(int delflag=1);
// double* convertAngles(){return convertAngles(currentPosition);};
@ -778,8 +778,24 @@ virtual int setReceiverFifoDepth(int i = -1)=0;
*/
virtual int pulsePixelNMove(int n=0,int x=0,int y=0)=0;
/**
Pulse Chip
\param n is number of times to pulse
\returns OK or FAIL
*/
virtual int pulseChip(int n=0)=0;
/**
Set acquiring flag in shared memory
\param b acquiring flag
*/
virtual void setAcquiringFlag(bool b=false)=0;
/**
Get acquiring flag from shared memory
\returns acquiring flag
*/
virtual bool getAcquiringFlag() = 0;