diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h index 6d21886f9..acf5ea981 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x542 +//#define SVNREV 0x550 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x542 -#define SVNDATE 0x20130506 +#define SVNREV 0x550 +#define SVNDATE 0x20130515 // diff --git a/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h b/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h index ac5426fc8..fae53e613 100644 --- a/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h +++ b/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x544 +//#define SVNREV 0x550 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x544 -#define SVNDATE 0x20130507 +#define SVNREV 0x550 +#define SVNDATE 0x20130515 // diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h index b7805756f..47a3cda4a 100644 --- a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x508 +//#define SVNREV 0x550 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x508 -#define SVNDATE 0x20130411 +#define SVNREV 0x550 +#define SVNDATE 0x20130515 // diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h index 421b5ef3c..a6b66066c 100644 --- a/slsDetectorSoftware/slsDetector/svnInfoLib.h +++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h @@ -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 0x549 +//#define SVNREV 0x550 //#define SVNKIND "" //#define SVNSCHED "" -#define SVNAUTHLIB "x04sa" -#define SVNREVLIB 0x549 -#define SVNDATELIB 0x20130514 +#define SVNAUTHLIB "l_maliakal_d" +#define SVNREVLIB 0x550 +#define SVNDATELIB 0x20130515 // diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver.cpp index e5a7223e2..b8ebc3ae0 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiver.cpp +++ b/slsDetectorSoftware/slsReceiver/slsReceiver.cpp @@ -18,29 +18,6 @@ void closeFile(int p){ 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 ret = slsDetectorDefs::OK; @@ -75,10 +52,6 @@ int main(int argc, char *argv[]) { //receiver->registerCallBackStartAcquisition(func,arg); - - printf("Registering StartAcq()\n"); - receiver->registerCallBackStartAcquisition(StartAcq, NULL); - /** callback argument is total farmes caught @@ -88,9 +61,6 @@ int main(int argc, char *argv[]) { //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); - printf("Registering GetData() \n"); - - - receiver->registerCallBackRawDataReady(GetData,NULL); - - receiver->start(); diff --git a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h index 457b41ae3..bd0afb4c9 100644 --- a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h +++ b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x548 +//#define SVNREV 0x550 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x548 -#define SVNDATE 0x20130513 +#define SVNREV 0x550 +#define SVNDATE 0x20130515 //