diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 0acec3c64..09ad992a7 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git -Repsitory UUID: d3951bb7497e1de9feb70a03706c442324bc4323 -Revision: 529 -Branch: hdf5 +Repsitory UUID: 9f0ea629975864abb9bb3fd9f59c1d9188e0f3d1 +Revision: 512 +Branch: 2.3 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 529 -Last Changed Date: 2017-03-03 09:06:49 +0100 +Last Changed Rev: 512 +Last Changed Date: 2017-03-23 15:17:21 +0100 diff --git a/slsReceiverSoftware/include/UDPBaseImplementation.h b/slsReceiverSoftware/include/UDPBaseImplementation.h index d307f125d..5e163b72d 100644 --- a/slsReceiverSoftware/include/UDPBaseImplementation.h +++ b/slsReceiverSoftware/include/UDPBaseImplementation.h @@ -520,8 +520,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter * * return value is * 0 callback takes care of open,close,wrie file - * 1 callback writes file, we have to open, close it - * 2 we open, close, write file, callback does not do anything + * 1 we open, close, write file, callback does not do anything */ void registerCallBackStartAcquisition(int (*func)(char*, char*, uint64_t, uint32_t, void*),void *arg); @@ -550,10 +549,10 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter * version is the version number of this structure format * dataPointer is the pointer to the data * dataSize in bytes is the size of the data in bytes - * fileDescriptor is the file descriptor */ void registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg); + char*, uint32_t, void*),void *arg); + @@ -643,8 +642,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter * * return value is * 0 callback takes care of open,close,wrie file - * 1 callback writes file, we have to open, close it - * 2 we open, close, write file, callback does not do anything + * 1 we open, close, write file, callback does not do anything */ int (*startAcquisitionCallBack)(char*, char*, uint64_t, uint32_t, void*); void *pStartAcquisition; @@ -676,12 +674,13 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter * version is the version number of this structure format * dataPointer is the pointer to the data * dataSize in bytes is the size of the data in bytes - * fileDescriptor is the file descriptor */ void (*rawDataReadyCallBack)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*); + char*, uint32_t, void*); void *pRawDataReady; - private: + + +private: }; diff --git a/slsReceiverSoftware/include/UDPInterface.h b/slsReceiverSoftware/include/UDPInterface.h index a5b01fb54..5eaacded5 100644 --- a/slsReceiverSoftware/include/UDPInterface.h +++ b/slsReceiverSoftware/include/UDPInterface.h @@ -578,9 +578,8 @@ class UDPInterface { * datasize * * return value is - * 0 callback takes care of open,close,wrie file - * 1 callback writes file, we have to open, close it - * 2 we open, close, write file, callback does not do anything + * 0 callback takes care of open,close,write file + * 1 we open, close, write file, callback does not do anything */ virtual void registerCallBackStartAcquisition(int (*func)(char*, char*, uint64_t, uint32_t, void*),void *arg) = 0; @@ -609,10 +608,9 @@ class UDPInterface { * version is the version number of this structure format * dataPointer is the pointer to the data * dataSize in bytes is the size of the data in bytes - * fileDescriptor is the file descriptor */ virtual void registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg) = 0; + char*, uint32_t, void*),void *arg) = 0; protected: diff --git a/slsReceiverSoftware/include/UDPStandardImplementation.h b/slsReceiverSoftware/include/UDPStandardImplementation.h index 750c5f38d..0a1c5ea1d 100644 --- a/slsReceiverSoftware/include/UDPStandardImplementation.h +++ b/slsReceiverSoftware/include/UDPStandardImplementation.h @@ -240,6 +240,7 @@ private: * Verifies if the callbacks are registered for the callback variable * @returns OK or FAIL */ + int VerifyCallBackAction(); diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 54a7a6e2b..aab086be3 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "d3951bb7497e1de9feb70a03706c442324bc4323" -//#define SVNREV 0x529 +#define SVNREPUUID "9f0ea629975864abb9bb3fd9f59c1d9188e0f3d1" +//#define SVNREV 0x512 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x529 -#define SVNDATE 0x20170303 +#define SVNREV 0x512 +#define SVNDATE 0x20170323 // diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h index 733db242f..427cb35e7 100755 --- a/slsReceiverSoftware/include/receiver_defs.h +++ b/slsReceiverSoftware/include/receiver_defs.h @@ -9,21 +9,18 @@ #define RECEIVE_SOCKET_BUFFER_SIZE (100*1024*1024) #define MAX_SOCKET_INPUT_PACKET_QUEUE 250000 + //files #define DO_NOTHING 0 -#define CREATE_FILES 1 -#define DO_EVERYTHING 2 +#define DO_EVERYTHING 1 -//binary file/ fifo - -//#define FILE_FRAME_HDR_FNUM_SIZE 8 -//#define FILE_FRAME_HDR_SNUM_SIZE 8 -//#define FILE_FRAME_HDR_BID_SIZE 8 -//#define FILE_FRAME_HEADER_SIZE (FILE_FRAME_HDR_FNUM_SIZE + FILE_FRAME_HDR_SNUM_SIZE + FILE_FRAME_HDR_BID_SIZE) - -#define FIFO_HEADER_NUMBYTES 4 +//binary #define FILE_BUFFER_SIZE (16*1024*1024) //16mb +//fifo +#define FIFO_HEADER_NUMBYTES 4 + + //hdf5 #define MAX_CHUNKED_IMAGES 1 diff --git a/slsReceiverSoftware/include/slsReceiver.h b/slsReceiverSoftware/include/slsReceiver.h index 3d9a1bcfc..a66afc321 100644 --- a/slsReceiverSoftware/include/slsReceiver.h +++ b/slsReceiverSoftware/include/slsReceiver.h @@ -67,8 +67,7 @@ class slsReceiver : private virtual slsReceiverDefs { * * return value is * 0 callback takes care of open,close,wrie file - * 1 callback writes file, we have to open, close it - * 2 we open, close, write file, callback does not do anything + * 1 we open, close, write file, callback does not do anything */ void registerCallBackStartAcquisition(int (*func)(char*, char*, uint64_t, uint32_t, void*),void *arg); @@ -97,10 +96,10 @@ class slsReceiver : private virtual slsReceiverDefs { * version is the version number of this structure format * dataPointer is the pointer to the data * dataSize in bytes is the size of the data in bytes - * fileDescriptor is the file descriptor */ void registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg); + char*, uint32_t, void*),void *arg); + private: diff --git a/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h b/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h index 1174fa52b..7952ac35e 100644 --- a/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h +++ b/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h @@ -66,8 +66,7 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs { * * return value is * 0 callback takes care of open,close,wrie file - * 1 callback writes file, we have to open, close it - * 2 we open, close, write file, callback does not do anything + * 1 we open, close, write file, callback does not do anything */ void registerCallBackStartAcquisition(int (*func)(char*, char*, uint64_t, uint32_t, void*),void *arg); @@ -96,11 +95,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs { * version is the version number of this structure format * dataPointer is the pointer to the data * dataSize in bytes is the size of the data in bytes - * fileDescriptor is the file descriptor */ void registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg); - + char*, uint32_t, void*),void *arg); private: /** @@ -311,8 +308,7 @@ private: * * return value is * 0 callback takes care of open,close,wrie file - * 1 callback writes file, we have to open, close it - * 2 we open, close, write file, callback does not do anything + * 1 we open, close, write file, callback does not do anything */ int (*startAcquisitionCallBack)(char*, char*, uint64_t, uint32_t, void*); void *pStartAcquisition; @@ -344,10 +340,9 @@ private: * version is the version number of this structure format * dataPointer is the pointer to the data * dataSize in bytes is the size of the data in bytes - * fileDescriptor is the file descriptor */ void (*rawDataReadyCallBack)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*); + char*, uint32_t, void*); void *pRawDataReady; diff --git a/slsReceiverSoftware/include/slsReceiverUsers.h b/slsReceiverSoftware/include/slsReceiverUsers.h index 67ba8f9c2..91b8a5564 100644 --- a/slsReceiverSoftware/include/slsReceiverUsers.h +++ b/slsReceiverSoftware/include/slsReceiverUsers.h @@ -51,7 +51,7 @@ public: @sort register calbback for starting the acquisition \param func callback to be called when starting the acquisition. Its arguments are filepath, filename, fileindex, datasize - \returns 0 callback takes care of open,close,write file; 1 callback writes file, we have to open, close it; 2 we open, close, write file, callback does not do anything + \returns 0 callback takes care of open,close,write file; 1 we open, close, write file, callback does not do anything */ void registerCallBackStartAcquisition(int (*func)(char* filepath, char* filename, uint64_t fileindex, uint32_t datasize, void*),void *arg); @@ -67,12 +67,12 @@ public: /** @sort register callback to be called when data are available (to process and/or save the data). - \param func raw data ready callback. arguments are frameNumber, expLength, packetNumber, bunchId, timestamp, modId, xCoord, yCoord, zCoord, debug, roundRNumber, detType, version, dataPointer, dataSize, fileDescriptor + \param func raw data ready callback. arguments are frameNumber, expLength, packetNumber, bunchId, timestamp, modId, xCoord, yCoord, zCoord, debug, roundRNumber, detType, version, dataPointer, dataSize \returns nothing */ void registerCallBackRawDataReady(void (*func)(uint64_t frameNumber, uint32_t expLength, uint32_t packetNumber, uint64_t bunchId, uint64_t timestamp, uint16_t modId, uint16_t xCoord, uint16_t yCoord, uint16_t zCoord, uint32_t debug, uint16_t roundRNumber, uint8_t detType, uint8_t version, - char* datapointer, uint32_t datasize, FILE* filedescriptor, void*),void *arg); + char* datapointer, uint32_t datasize, void*),void *arg); //receiver object slsReceiver* receiver; diff --git a/slsReceiverSoftware/src/UDPBaseImplementation.cpp b/slsReceiverSoftware/src/UDPBaseImplementation.cpp index b662f9e44..77350d599 100644 --- a/slsReceiverSoftware/src/UDPBaseImplementation.cpp +++ b/slsReceiverSoftware/src/UDPBaseImplementation.cpp @@ -552,7 +552,7 @@ void UDPBaseImplementation::registerCallBackAcquisitionFinished(void (*func)(uin } void UDPBaseImplementation::registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg){ + char*, uint32_t, void*),void *arg){ rawDataReadyCallBack=func; pRawDataReady=arg; } diff --git a/slsReceiverSoftware/src/slsReceiver.cpp b/slsReceiverSoftware/src/slsReceiver.cpp index 0db3dc793..4a28ab8e1 100644 --- a/slsReceiverSoftware/src/slsReceiver.cpp +++ b/slsReceiverSoftware/src/slsReceiver.cpp @@ -180,7 +180,7 @@ void slsReceiver::registerCallBackAcquisitionFinished(void (*func)(uint64_t, voi void slsReceiver::registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg){ + char*, uint32_t, void*),void *arg){ //tcpipInterface if(udp_interface) udp_interface->registerCallBackRawDataReady(func,arg); diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index f0a2919ce..c8ca0b36b 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -2691,7 +2691,7 @@ void slsReceiverTCPIPInterface::registerCallBackAcquisitionFinished(void (*func) } void slsReceiverTCPIPInterface::registerCallBackRawDataReady(void (*func)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, - char*, uint32_t, FILE*, void*),void *arg){ + char*, uint32_t, void*),void *arg){ rawDataReadyCallBack=func; pRawDataReady=arg; } diff --git a/slsReceiverSoftware/src/slsReceiverUsers.cpp b/slsReceiverSoftware/src/slsReceiverUsers.cpp index 762e98fa3..5c83caa99 100644 --- a/slsReceiverSoftware/src/slsReceiverUsers.cpp +++ b/slsReceiverSoftware/src/slsReceiverUsers.cpp @@ -17,7 +17,6 @@ void slsReceiverUsers::stop() { receiver->stop(); } - void slsReceiverUsers::closeFile(int p) { receiver->closeFile(p); } @@ -26,7 +25,6 @@ int64_t slsReceiverUsers::getReceiverVersion(){ return receiver->getReceiverVersion(); } - void slsReceiverUsers::registerCallBackStartAcquisition(int (*func)(char*, char*, uint64_t, uint32_t, void*),void *arg){ receiver->registerCallBackStartAcquisition(func,arg); } @@ -37,7 +35,7 @@ void slsReceiverUsers::registerCallBackAcquisitionFinished(void (*func)(uint64_t void slsReceiverUsers::registerCallBackRawDataReady(void (*func)(uint64_t frameNumber, uint32_t expLength, uint32_t packetNumber, uint64_t bunchId, uint64_t timestamp, uint16_t modId, uint16_t xCoord, uint16_t yCoord, uint16_t zCoord, uint32_t debug, uint16_t roundRNumber, uint8_t detType, uint8_t version, - char* datapointer, uint32_t datasize, FILE* filedescriptor, void*), void *arg){ + char* datapointer, uint32_t datasize, void*), void *arg){ receiver->registerCallBackRawDataReady(func,arg); }