detectors/slsDetectorPackage
24
1 Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-11-13 22:03:53 +01:00
Code Issues Actions Packages Releases Activity

when using userReceiver with many instances of the receiver in one program, the index will keep increasing, hence need to adjust zmq port and det index in file name

Browse Source
This commit is contained in:
Dhanya Maliakal committed 2017-06-22 12:27:17 +02:00
1 parent 1dc774d229
commit 98cb8de478
3 files changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

slsReceiverSoftware/include/BinaryFileStatic.h
+1 -1
View File
@@ -44,7 +44,7 @@ class BinaryFileStatic {
{
ostringstream osfn;
osfn << fpath << "/" << fnameprefix;
if (dindex >= 0) osfn << "_d" << (dindex * numunits + unitindex);
if (dindex >= 0) osfn << "_d" << ((unitindex >= numunits) ? unitindex : (dindex * numunits + unitindex)); //if unit index > numunits, all receivers in one program (userReceiver)
if (frindexenable) osfn << "_f" << setfill('0') << setw(12) << fnum;
osfn << "_" << findex;
osfn << ".raw";
slsReceiverSoftware/include/HDF5FileStatic.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
{
ostringstream osfn;
osfn << fpath << "/" << fnameprefix;
if (dindex >= 0) osfn << "_d" << (dindex * numunits + unitindex);
if (dindex >= 0) osfn << "_d" << ((unitindex >= numunits) ? unitindex : (dindex * numunits + unitindex)); //if unit index > numunits, all receivers in one program (userReceiver)
if (frindexenable) osfn << "_f" << setfill('0') << setw(12) << fnum;
osfn << "_" << findex;
osfn << ".h5";
slsReceiverSoftware/src/DataStreamer.cpp
+3
View File
@@ -160,6 +160,9 @@ int DataStreamer::SetThreadPriority(int priority) {
int DataStreamer::CreateZmqSockets(int* dindex, int* nunits) {
uint32_t portnum = DEFAULT_ZMQ_PORTNO + ((*dindex) * (*nunits) + index);
//using userReceiver where all receivers in one program (numberofstreamers>*nunits)
if(index >= *nunits)
portnum = DEFAULT_ZMQ_PORTNO + index;
zmqSocket = new ZmqSocket(portnum);
if (zmqSocket->IsError()) {