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

fixed gui for new header

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-03-20 09:28:15 +01:00
parent 1413244617
commit 575c9617c7
4 changed files with 70 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 5edf56eead747efd9f52c5b29d3e23a235a74479 Repsitory UUID: 37c93c568669422f853cc8eb3f22d3b4afc257ba
Revision: 503 Revision: 504
Branch: 2.3-rc Branch: 2.3-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 503 Last Changed Rev: 504
Last Changed Date: 2017-03-15 15:00:25 +0100 Last Changed Date: 2017-03-15 15:02:28 +0100

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "5edf56eead747efd9f52c5b29d3e23a235a74479" #define SVNREPUUID "37c93c568669422f853cc8eb3f22d3b4afc257ba"
//#define SVNREV 0x503 //#define SVNREV 0x504
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x503 #define SVNREV 0x504
#define SVNDATE 0x20170315 #define SVNDATE 0x20170315
// //

3
slsReceiverSoftware/include/receiver_defs.h
View File

@ -58,7 +58,8 @@ typedef struct {
#define HEADER_SIZE_NUM_PACKETS 1 #define HEADER_SIZE_NUM_PACKETS 1
#define ALL_MASK_32 0xFFFFFFFF #define ALL_MASK_32 0xFFFFFFFF
#define SLS_DETECTOR_HEADER_VERSION 0x1 #define SLS_DETECTOR_HEADER_VERSION 0x1
#define SLS_DETECTOR_JSON_HEADER_VERSION 0x2
//#define FILE_FRAME_HEADER_LENGTH (8*3) //#define FILE_FRAME_HEADER_LENGTH (8*3)
//#define FILE_HEADER_TIMESTAMP_OFFSET 8 //start of frame/ bunch id //#define FILE_HEADER_TIMESTAMP_OFFSET 8 //start of frame/ bunch id
//#define FILE_HEADER_EXPLENGTH_OFFSET 16 //exposure length/ sub frame number //#define FILE_HEADER_EXPLENGTH_OFFSET 16 //exposure length/ sub frame number

79
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1785,13 +1785,38 @@ void UDPStandardImplementation::startDataCallback(){
//header details //header details
const char *type = "float64"; const char *jsonFmt ="{"
const char *shape= "[1024, 512]"; "\"jsonversion\":%u, "
const char *jsonFmt ="{\"htype\":[\"chunk-1.0\"], \"type\":\"%s\", \"shape\":%s, \"acqIndex\":%d, \"fIndex\":%d, \"subfnum\":%d, \"fname\":\"%s\"}"; "\"acqIndex\":%llu, "
"\"fIndex\":%llu, "
"\"bitmode\":%d, "
"\"shape\":[%d, %d], "
"\"fname\":\"%s\", "
"\"frameNumber\":%llu, "
"\"expLength\":%u, "
"\"packetNumber\":%u, "
"\"bunchId\":%llu, "
"\"timestamp\":%llu, "
"\"modId\":%u, "
"\"xCoord\":%u, "
"\"yCoord\":%u, "
"\"zCoord\":%u, "
"\"debug\":%u, "
"\"roundRNumber\":%u, "
"\"detType\":%u, "
"\"version\":%u"
"}";
int npixelsx=0, npixelsy=0;
switch(myDetectorType) {
case JUNGFRAU: npixelsx = JFRAU_PIXELS_IN_ONE_ROW; npixelsy = JFRAU_PIXELS_IN_ONE_COL; break;
case EIGER: npixelsx = EIGER_PIXELS_IN_ONE_ROW; npixelsy = EIGER_PIXELS_IN_ONE_COL; break;
default:break; /* will not work for other detectors*/
}
char buf[1000]; char buf[1000];
int acquisitionIndex = -1; uint64_t acquisitionIndex = -1;
int frameIndex = -1; uint64_t frameIndex = -1;
int subframeIndex = -1; uint32_t subframeIndex = -1;
#ifdef DEBUG #ifdef DEBUG
int oldpnum = -1; int oldpnum = -1;
#endif #endif
@ -1816,7 +1841,9 @@ void UDPStandardImplementation::startDataCallback(){
frameIndex = fnum; frameIndex = fnum;
acquisitionIndex = fnum - startAcquisitionIndex; acquisitionIndex = fnum - startAcquisitionIndex;
if(dynamicRange == 32) subframeIndex = snum; if(dynamicRange == 32) subframeIndex = snum;
int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]); int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send data //send data
zmq_send(zmqsocket, buffer, oneframesize, 0); zmq_send(zmqsocket, buffer, oneframesize, 0);
@ -1828,12 +1855,15 @@ void UDPStandardImplementation::startDataCallback(){
//send final header //send final header
//update frame details //update frame details
#ifdef DEBUG #ifdef DEBUG
cout << "sending dummy" << endl; cprintf(BLUE,"%d sending dummy\n");
#endif #endif
frameIndex = -9;
acquisitionIndex = -9; frameIndex = -1;
subframeIndex = -9; acquisitionIndex = -1;
int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]); int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send final data //send final data
zmq_send (zmqsocket, "end", 3, 0); zmq_send (zmqsocket, "end", 3, 0);
@ -1863,12 +1893,21 @@ void UDPStandardImplementation::startDataCallback(){
} }
if(excludeMissingPackets){ if(excludeMissingPackets){
#ifdef DEBUG
cprintf(BLUE,"%d sending image\n", ithread);
#endif
//send header //send header
//update frame details //update frame details
frameIndex = (*((uint64_t*)(latestData[ithread]))) - startFrameIndex; sls_detector_header* header = (sls_detector_header*) (latestData[ithread]);
acquisitionIndex = (*((uint64_t*)(latestData[ithread]))) - startAcquisitionIndex; uint64_t fnum = header->frameNumber;
subframeIndex = -1; frameIndex = fnum - startFrameIndex;
int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]); acquisitionIndex = fnum - startAcquisitionIndex;
int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
header->frameNumber, header->expLength, header->packetNumber, header->bunchId, header->timestamp,
header->modId, header->xCoord, header->yCoord, header->zCoord, header->debug, header->roundRNumber, header->detType, header->version);
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send data //send data
zmq_send(zmqsocket, (latestData[ithread]+sizeof(sls_detector_header)), bufferSize, 0); zmq_send(zmqsocket, (latestData[ithread]+sizeof(sls_detector_header)), bufferSize, 0);
@ -1922,7 +1961,9 @@ void UDPStandardImplementation::startDataCallback(){
frameIndex = fnum; frameIndex = fnum;
acquisitionIndex = fnum - startAcquisitionIndex; acquisitionIndex = fnum - startAcquisitionIndex;
if(dynamicRange == 32) subframeIndex = snum; if(dynamicRange == 32) subframeIndex = snum;
int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]); int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send data //send data
zmq_send(zmqsocket, buffer, oneframesize, 0); zmq_send(zmqsocket, buffer, oneframesize, 0);
@ -1958,7 +1999,9 @@ void UDPStandardImplementation::startDataCallback(){
frameIndex = fnum; frameIndex = fnum;
acquisitionIndex = fnum - startAcquisitionIndex; acquisitionIndex = fnum - startAcquisitionIndex;
if(dynamicRange == 32) subframeIndex = snum; if(dynamicRange == 32) subframeIndex = snum;
int len = sprintf(buf,jsonFmt,type,shape, acquisitionIndex, frameIndex, subframeIndex,completeFileName[ithread]); int len = sprintf(buf,jsonFmt,
SLS_DETECTOR_JSON_HEADER_VERSION, acquisitionIndex, frameIndex, dynamicRange, npixelsx, npixelsy,completeFileName[ithread],
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );/* will not work for other detectors*/
zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE); zmq_send(zmqsocket, buf,len, ZMQ_SNDMORE);
//send data //send data
zmq_send(zmqsocket, buffer, oneframesize, 0); zmq_send(zmqsocket, buffer, oneframesize, 0);