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

edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-05-27 09:11:26 +00:00
parent 74bcbf0d9a
commit 666c73c988
25 changed files with 179 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6360,10 +6360,3 @@ int slsDetector::setReadReceiverFrequency(int getFromReceiver,int i){
}
void slsDetector::waitForReceiverReadToFinish(){
if(dataSocket){
while(dataSocket->Connect() < 0)
usleep(1000);
dataSocket->Disconnect();
}
}

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1603,10 +1603,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
int setReadReceiverFrequency(int getFromReceiver, int i=-1);
/**
* Waits for receiver read to finish after stopping acquisition
*/
void waitForReceiverReadToFinish();
protected:

4
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -230,7 +230,9 @@ void slsDetectorUsers::finalizeDataset(double *a, double *v, double *e, int &np)
int slsDetectorUsers::setReceiverMode(int n){
return myDetector->setReadReceiverFrequency(1,n);
}

7
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -415,6 +415,13 @@ class slsDetectorUsers
*/
string getDetectorType();
/**
@short sets the mode by which gui requests data from receiver
\param n is 0 for random requests for fast acquisitions and greater than 0 for nth read requests
\returns the mode set in the receiver
*/
int setReceiverMode(int n=-1);
/**
@short register calbback for accessing detector final data
\param userCallback function for plotting/analyzing the data. Its arguments are the data structure d and the frame number f.

5
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -683,11 +683,6 @@ virtual ROI* getROI(int &n)=0;
virtual int setReadReceiverFrequency(int getFromReceiver, int i=-1)=0;
/**
* Waits for receiver read to finish after stopping acquisition
*/
virtual void waitForReceiverReadToFinish()=0;
protected:

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x564
//#define SVNREV 0x576
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x564
#define SVNDATELIB 0x20130517
#define SVNREVLIB 0x576
#define SVNDATELIB 0x20130523
//