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

added default gui server port number

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@479 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-03-01 13:14:47 +00:00
parent e3d68d05c6
commit 6aa90bba79
7 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/MySocketTCP/genericSocket.h
View File

@ -76,6 +76,7 @@ using namespace std;
#define DEFAULT_PORTNO 1952 #define DEFAULT_PORTNO 1952
#define DEFAULT_BACKLOG 5 #define DEFAULT_BACKLOG 5
#define DEFAULT_UDP_PORTNO 50001 #define DEFAULT_UDP_PORTNO 50001
#define DEFAULT_GUI_PORTNO 65000
class genericSocket{ class genericSocket{

3
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -194,9 +194,6 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
} }
thisMultiDetector->alreadyExisting=1; thisMultiDetector->alreadyExisting=1;
} }

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -191,7 +191,6 @@ class multiSlsDetector : public slsDetectorUtils {
mysteps scanSteps[MAX_SCAN_LEVELS]; mysteps scanSteps[MAX_SCAN_LEVELS];
int scanPrecision[MAX_SCAN_LEVELS]; int scanPrecision[MAX_SCAN_LEVELS];
}; };
@ -1188,6 +1187,7 @@ class multiSlsDetector : public slsDetectorUtils {
*/ */
int calibratePedestal(int frames = 0); int calibratePedestal(int frames = 0);
protected: protected:

2
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -233,7 +233,7 @@ void slsDetectorUsers::registerRawDataCallback(int( *userCallback)(double*, int,
void slsDetectorUsers::registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){ void slsDetectorUsers::registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){
myDetector->registerAcquisitionFinishedCallback(func,pArg); myDetector->registerAcquisitionFinishedCallback(func,pArg);
} }
void slsDetectorUsers::registerGetPositionCallback( double (*func)(void*),void *arg){ void slsDetectorUsers::registerGetPositionCallback( double (*func)(void*),void *arg){
myDetector->registerGetPositionCallback(func,arg); myDetector->registerGetPositionCallback(func,arg);
} }

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -43,7 +43,7 @@ slsDetectorUtils::slsDetectorUtils() {
void slsDetectorUtils::acquire(int delflag){ void slsDetectorUtils::acquire(int delflag){
bool receiver = (setReceiverOnline()==ONLINE_FLAG); bool receiver = (setReceiverOnline()==ONLINE_FLAG);
// setTotalProgress(); // setTotalProgress();
//moved these 2 here for measurement change //moved these 2 here for measurement change

4
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -546,7 +546,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
void registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){acquisition_finished=func; acqFinished_p=pArg;}; void registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){acquisition_finished=func; acqFinished_p=pArg;};
void registerMeasurementFinishedCallback(int( *func)(int,int, void*), void *pArg){measurement_finished=func; measFinished_p=pArg;}; void registerMeasurementFinishedCallback(int( *func)(int,int, void*), void *pArg){measurement_finished=func; measFinished_p=pArg;};
void registerProgressCallback(int( *func)(double,void*), void *pArg){progress_call=func; pProgressCallArg=pArg;}; void registerProgressCallback(int( *func)(double,void*), void *pArg){progress_call=func; pProgressCallArg=pArg;};
@ -703,6 +703,8 @@ virtual ROI* getROI(int &n)=0;
int (*measurement_finished)(int,int,void*); int (*measurement_finished)(int,int,void*);
void *acqFinished_p, *measFinished_p; void *acqFinished_p, *measFinished_p;
int (*progress_call)(double,void*); int (*progress_call)(double,void*);
void *pProgressCallArg; void *pProgressCallArg;

3
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -257,9 +257,6 @@ private:
/** Receiver buffer */ /** Receiver buffer */
char *mem0, *memfull; char *mem0, *memfull;
/** latest data */ /** latest data */
char* latestData; char* latestData;