detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 14:38:14 +02:00
Code Issues Actions Packages Releases Activity

updated svn without the callback defaults

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@551 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-15 13:27:54 +00:00
parent c8535a15a8
commit 91661c3e5f
6 changed files with 16 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x542 //#define SVNREV 0x550
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x542 #define SVNREV 0x550
#define SVNDATE 0x20130506 #define SVNDATE 0x20130515
// //

6
slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x544 //#define SVNREV 0x550
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x544 #define SVNREV 0x550
#define SVNDATE 0x20130507 #define SVNDATE 0x20130515
// //

6
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x508 //#define SVNREV 0x550
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x508 #define SVNREV 0x550
#define SVNDATE 0x20130411 #define SVNDATE 0x20130515
// //

8
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

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

36
slsDetectorSoftware/slsReceiver/slsReceiver.cpp
View File

@ -18,29 +18,6 @@ void closeFile(int p){
exit(0); exit(0);
} }
int StartAcq(char* filepath, char*filename,int fileindex, int datasize, void*p){
printf("--StartAcq: filepath:%s filename:%s fileindex:%d datasize:%d\n",
filepath, filename, fileindex, datasize);
printf("--StartAcq: returning 0\n");
return 0;
}
void AcquisitionFinished(int frames, void*p){
printf("AcquisitionFinished: frames:%d why ?\n",frames);
}
void GetData(int framenum, char* datapointer, FILE* descriptor, char* gui, void* p){
printf("GetData: framenum: %d(%d)\n", framenum, *(int*)datapointer);
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int ret = slsDetectorDefs::OK; int ret = slsDetectorDefs::OK;
@ -75,10 +52,6 @@ int main(int argc, char *argv[]) {
//receiver->registerCallBackStartAcquisition(func,arg); //receiver->registerCallBackStartAcquisition(func,arg);
printf("Registering StartAcq()\n");
receiver->registerCallBackStartAcquisition(StartAcq, NULL);
/** /**
callback argument is callback argument is
total farmes caught total farmes caught
@ -88,9 +61,6 @@ int main(int argc, char *argv[]) {
//receiver->registerCallBackAcquisitionFinished(func,arg); //receiver->registerCallBackAcquisitionFinished(func,arg);
printf("Registering AcquisitionFinished()\n");
receiver->registerCallBackAcquisitionFinished(AcquisitionFinished, NULL);
/** /**
@ -110,12 +80,6 @@ int main(int argc, char *argv[]) {
//receiver->registerCallBackRawDataReady(func,arg); //receiver->registerCallBackRawDataReady(func,arg);
printf("Registering GetData() \n");
receiver->registerCallBackRawDataReady(GetData,NULL);
receiver->start(); receiver->start();

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x548 //#define SVNREV 0x550
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x548 #define SVNREV 0x550
#define SVNDATE 0x20130513 #define SVNDATE 0x20130515
// //