made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now

slsReceiverSoftware/include/DataStreamer.h

@@ -100,9 +100,10 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	 * Creates Zmq Sockets
 	 * @param nunits pointer to number of theads/ units per detector
 	 * @param port streaming port start index
+	 * @param srcip streaming source ip
 	 * @return OK or FAIL
 	 */
-	int CreateZmqSockets(int* nunits, uint32_t port);
+	int CreateZmqSockets(int* nunits, uint32_t port, const char* srcip);
 
 	/**
 	 * Shuts down and deletes Zmq Sockets

slsReceiverSoftware/include/GeneralData.h

@@ -163,6 +163,14 @@ public:
 		bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
 	};
 
+	/**
+	 * Setting packets per frame changes member variables
+	 * @param packets per frame
+	 */
+	virtual void SetPacketsPerFrame(uint32_t ppf) {
+		bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
+	};
+
 	/**
 	 * Print all variables
 	 */
@@ -376,21 +384,35 @@ class Moench03Data : public GeneralData {
 
 class JCTBData : public GeneralData {
 
+
+private:
+	/** Structure of an jungfrau ctb packet header */
+	typedef struct {
+		unsigned char emptyHeader[6];
+		unsigned char reserved[4];
+		unsigned char packetNumber[1];
+		unsigned char frameNumber[3];
+		unsigned char bunchid[8];
+	} jfrauctb_packet_header_t;
+
  public:
 
+
+
 	/** Bytes Per Adc */
 	const static uint32_t bytesPerAdc = 2;
 
 	/** Constructor */
 	JCTBData(){
 		myDetectorType		= slsReceiverDefs::JUNGFRAUCTB;
-		nPixelsX 			= 32;
-		nPixelsY 			= 128;
+		nPixelsX 			= 32;	//(256*4);
+		nPixelsY 			= 128;	//(256*2);
 		headerSizeinPacket  = 22;
 		dataSize 			= 8192;
 		packetSize 			= headerSizeinPacket + dataSize;
 		packetsPerFrame 	= 1;
 		imageSize 			= dataSize*packetsPerFrame;
+		frameIndexMask 		= 0xFFFFFF;
 		maxFramesPerFile 	= JFCTB_MAX_FRAMES_PER_FILE;
 		fifoBufferHeaderSize= FIFO_HEADER_NUMBYTES + sizeof(slsReceiverDefs::sls_detector_header);
 		defaultFifoDepth 	= 2500;
@@ -399,6 +421,46 @@ class JCTBData : public GeneralData {
 		imageSize_Streamer 	= imageSize;
 	};
 
+ 	/**
+ 	 * Get Header Infomation (frame number, packet number)
+ 	 * @param index thread index for debugging purposes
+ 	 * @param packetData pointer to data
+ 	 * @param frameNumber frame number
+ 	 * @param packetNumber packet number
+ 	 */
+	virtual void GetHeaderInfo(int index, char* packetData,	uint64_t& frameNumber, uint32_t& packetNumber) const 	{
+		jfrauctb_packet_header_t* header = (jfrauctb_packet_header_t*)(packetData);
+		frameNumber = (uint64_t)((*( (uint32_t*) header->frameNumber)) & frameIndexMask);
+		packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber));
+	}
+
+	/**
+	 * Get Header Infomation (frame number, packet number)
+	 * @param index thread index for debugging purposes
+	 * @param packetData pointer to data
+	 * @param dynamicRange dynamic range to assign subframenumber if 32 bit mode
+	 * @param frameNumber frame number 	 * @param packetNumber packet number
+	 * @param subFrameNumber sub frame number if applicable
+	 * @param bunchId bunch id
+	 */
+	void GetHeaderInfo(int index, char* packetData, uint32_t dynamicRange,
+			uint64_t& frameNumber, uint32_t& packetNumber, uint32_t& subFrameNumber, uint64_t& bunchId) const 	{
+		subFrameNumber = -1;
+		jfrauctb_packet_header_t* header = (jfrauctb_packet_header_t*)(packetData);
+		frameNumber = (uint64_t)((*( (uint32_t*) header->frameNumber)) & frameIndexMask);
+		packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber));
+		bunchId = (*((uint64_t*) header->bunchid));
+	}
+
+	/**
+	 * Setting packets per frame changes member variables
+	 * @param packets per frame
+	 */
+	void SetPacketsPerFrame(uint32_t ppf) {
+		packetsPerFrame = ppf;
+		imageSize 		= dataSize*packetsPerFrame;
+	};
+
 	/**
 	 * Print all variables
 	 */

slsReceiverSoftware/include/UDPBaseImplementation.h

@@ -213,6 +213,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	uint64_t getNumberOfFrames() const;
 
+	/*
+	 * Get Number of Samples expected by receiver from detector (for chip test board only)
+	 * @return number of samples expected
+	 */
+	uint64_t getNumberofSamples() const;
+
 	/**
 	 * Get Dynamic Range or Number of Bits Per Pixel
 	 * @return dynamic range that is 4, 8, 16 or 32
@@ -253,6 +259,11 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	uint32_t getStreamingPort() const;
 
+	/**
+	 * Get streaming source ip
+	 * @return streaming source ip
+	 */
+	char *getStreamingSourceIP() const;
 
 
 	/*************************************************************************
@@ -413,10 +424,16 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 * Set Number of Frames expected by receiver from detector
 	 * The data receiver status will change from running to idle when it gets this number of frames
 	 * @param i number of frames expected
-	 * @return OK or FAIL
 	 */
 	int setNumberOfFrames(const uint64_t i);
 
+	/**
+	 * Set Number of Samples expected by receiver from detector
+	 * @param i number of Samples expected
+	 * @return OK or FAIL
+	 */
+	int setNumberofSamples(const uint64_t i);
+
 	/**
 	 * Set Dynamic Range or Number of Bits Per Pixel
 	 * @param i dynamic range that is 4, 8, 16 or 32
@@ -529,6 +546,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	void setStreamingPort(const uint32_t i);
 
+	/**
+	 * Set streaming source ip
+	 * @param c streaming source ip
+	 */
+	void setStreamingSourceIP(const char* c);
+
 	//***callback functions***
 	/**
 	 * Call back for start acquisition
@@ -598,6 +621,8 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	uint64_t subExpTime;
 	/** Frame Number */
 	uint64_t numberOfFrames;
+	/** Samples Number */
+	uint64_t numberOfSamples;
 	/** Dynamic Range */
 	uint32_t dynamicRange;
 	/** Ten Giga Enable*/
@@ -652,7 +677,8 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	bool dataStreamEnable;
 	/** streaming port */
 	uint32_t streamingPort;
-
+	/** streaming port */
+	char streamingSrcIP[MAX_STR_LENGTH];
 
 	//***callback parameters***
 	/**

slsReceiverSoftware/include/UDPInterface.h

@@ -43,12 +43,14 @@ class UDPInterface {
 	 *	-setAcquisitionPeriod
 	 *	-setNumberOfFrames
 	 *	-setAcquisitionTime
-	 *	-setSubExpTime
+	 *	-setSubExpTime (if eiger)
+	 *	-setNumberofSamples (if chip test board)
 	 *	-setDynamicRange
-	 *	-setFlippedData
-	 *	-setActivate
-	 *	-setTenGigaEnable
+	 *	-setFlippedData (if eiger)
+	 *	-setActivate (if eiger)
+	 *	-setTenGigaEnable (if eiger)
 	 *	-setStreamingPort
+	 *	-setStreamingSourceIP
 	 *	-setDataStreamEnable
 	 *
 	 *
@@ -293,11 +295,17 @@ class UDPInterface {
 
 	/*
 	 * Get Number of Frames expected by receiver from detector
-	 * The data receiver status will change from running to idle when it gets this number of frames FIXME: (Not implemented)
-	 * @return number of frames expected
+	 * The data receiver status will change from running to idle when it gets this number of frames FIXME: (for Leo? Not implemented)
+	 * @return number of samples expected
 	 */
 	virtual uint64_t getNumberOfFrames() const = 0;
 
+	/*
+	 * Get Number of Samples expected by receiver from detector (for chip test board only)
+	 * @return number of samples expected
+	 */
+	virtual uint64_t getNumberofSamples() const = 0;
+
 	/**
 	 * Get Dynamic Range or Number of Bits Per Pixel
 	 * @return dynamic range that is 4, 8, 16 or 32
@@ -337,6 +345,12 @@ class UDPInterface {
 	 */
 	virtual uint32_t getStreamingPort() const = 0;
 
+	/**
+	 * Get streaming source ip
+	 * @return streaming source ip
+	 */
+	virtual char *getStreamingSourceIP() const = 0;
+
 
 	/*************************************************************************
 	 * Setters ***************************************************************
@@ -492,12 +506,19 @@ class UDPInterface {
 
 	/**
 	 * Set Number of Frames expected by receiver from detector
-	 * The data receiver status will change from running to idle when it gets this number of frames FIXME: (Not implemented)
+	 * The data receiver status will change from running to idle when it gets this number of frames FIXME: (for Leo? Not implemented)
 	 * @param i number of frames expected
 	 * @return OK or FAIL
 	 */
 	virtual int setNumberOfFrames(const uint64_t i) = 0;
 
+	/**
+	 * Set Number of Samples expected by receiver from detector
+	 * @param i number of Samples expected
+	 * @return OK or FAIL
+	 */
+	virtual int setNumberofSamples(const uint64_t i) = 0;
+
 	/**
 	 * Set Dynamic Range or Number of Bits Per Pixel
 	 * @param i dynamic range that is 4, 8, 16 or 32
@@ -610,6 +631,12 @@ class UDPInterface {
 	 */
 	virtual void setStreamingPort(const uint32_t i) = 0;
 
+	/**
+	 * Set streaming source ip
+	 * @param c streaming source ip
+	 */
+	virtual void setStreamingSourceIP(const char* c) = 0;
+
 
 	//***callback functions***
 	/**

slsReceiverSoftware/include/UDPStandardImplementation.h

@@ -80,6 +80,13 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
 	 */
 	int setDataStreamEnable(const bool enable);
 
+	/**
+	 * Set Number of Samples expected by receiver from detector
+	 * @param i number of Samples expected
+	 * @return OK or FAIL
+	 */
+	int setNumberofSamples(const uint64_t i);
+
 	/**
 	 * Set Dynamic Range or Number of Bits Per Pixel
 	 * @param i dynamic range that is 4, 8, 16 or 32
@@ -225,6 +232,9 @@ private:
 	/** Number of Jobs */
 	int numberofJobs;
 
+	/** Number of channels in roi for jungfrauctb */
+	int nroichannels;
+
 	//** class objects ***
 	/** General Data Properties */
 	GeneralData* generalData;

slsReceiverSoftware/include/ZmqSocket.h

@@ -8,7 +8,7 @@
  */
 
 #include "ansi.h"
-//#include "sls_receiver_defs.h"
+#include "sls_receiver_defs.h"
 
 //#define ZMQ_DETAIL
 
@@ -17,6 +17,8 @@
 #include <netdb.h>				//gethostbyname()
 #include <arpa/inet.h>			//inet_ntoa
 #include <rapidjson/document.h> //json header in zmq stream
+#include <string.h>
+#include <unistd.h> 			//usleep in some machines
 using namespace rapidjson;
 
 #define DEFAULT_ZMQ_PORTNO 	30001
@@ -56,6 +58,9 @@ public:
 
 		// construct address
 		sprintf (serverAddress, "tcp://%s:%d", ip, portno);
+#ifdef VERBOSE
+		cprintf(BLUE,"addres:%s\n",serverAddress);
+#endif
 
 		// create context
 		contextDescriptor = zmq_ctx_new();
@@ -97,8 +102,10 @@ public:
 	 * Creates socket, context and connects to server
 	 * @param hostname hostname or ip of server
 	 * @param portnumber port number
+	 * @param ethip is the ip of the ethernet interface to stream zmq from.
+	 * If blank, it will get ip from "hostname -i", else stream to all interfaces
 	 */
-	ZmqSocket (const uint32_t portnumber):
+	ZmqSocket (const uint32_t portnumber, const char *ethip=NULL):
 		portno (portnumber),
 		server (true),
 		contextDescriptor (NULL),
@@ -113,16 +120,45 @@ public:
 		if (socketDescriptor == NULL) {
 			PrintError ();
 			Close ();
+			return;
 		}
 
 		//Socket Options provided above
 
-		// construct address
-		sprintf (serverAddress,"tcp://*:%d", portno);
+
+		// construct ip to stream from
+		char ip[MAX_STR_LENGTH];
+		memset(ip, 0, MAX_STR_LENGTH);
+
+		// if ethip pre-defined
+		if (ethip != NULL)
+			strcpy(ip,ethip);
+		else {
+			bool valid = false;
+			FILE *sysFile = popen("hostname -i", "r");
+			if (sysFile != NULL) {
+				if (fgets(ip, MAX_STR_LENGTH, sysFile) != NULL) {
+					sscanf(ip,"%s\n",ip);
+#ifdef VERBOSE
+					cprintf(BLUE, "read ip:%s.\n",ip);
+#endif
+					valid = true;
+					pclose(sysFile);
+				}
+			}
+			if(!valid)
+				strcpy(ip,"*");
+
+		}
+
+
+		// construct addresss
+		sprintf (serverAddress,"tcp://%s:%d", ip, portno);
 		// bind address
 		if (zmq_bind (socketDescriptor, serverAddress) < 0) {
 			PrintError ();
 			Close ();
+			return;
 		}
 
 		//sleep for a few milliseconds to allow a slow-joiner
@@ -313,7 +349,7 @@ public:
 	 * @returns 0 if error or end of acquisition, else 1
 	 */
 	int ReceiveHeader(const int index, uint64_t &acqIndex,
-			uint64_t &frameIndex, uint32_t &subframeIndex, string &filename)
+			uint64_t &frameIndex, uint32_t &subframeIndex, std::string &filename)
 	{
 		zmq_msg_t message;
 		zmq_msg_init (&message);
@@ -389,7 +425,7 @@ public:
 	 * @returns true if successfull else false
 	 */
 	int ParseHeader(const int index, int length, zmq_msg_t& message, uint64_t &acqIndex,
-			uint64_t &frameIndex, uint32_t &subframeIndex, string &filename, bool& dummy)
+			uint64_t &frameIndex, uint32_t &subframeIndex, std::string &filename, bool& dummy)
 	{
 
 		acqIndex = -1;
@@ -491,6 +527,7 @@ public:
 	};
 
 
+
 private:
 	/** Port Number */
 	uint32_t portno;

slsReceiverSoftware/include/receiver_defs.h

@@ -45,3 +45,6 @@
 #define PROCESSOR_PRIORITY				70
 #define STREAMER_PRIORITY				10
 #define TCP_PRIORITY					10
+
+//jctb
+#define DEFAULT_NROI_CHANNELS			32

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -264,6 +264,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
 	/** set streaming port */
 	int set_streaming_port();
 
+	/** set streaming source ip */
+	int set_streaming_source_ip();
+
 
 
 	/** detector type */

slsReceiverSoftware/include/sls_receiver_funcs.h

@@ -61,6 +61,7 @@ enum recFuncs{
 	F_SEND_RECEIVER_DETPOSID,		/** < sets the detector position id in the reveiver */
 	F_SEND_RECEIVER_MULTIDETSIZE,    /** < sets the multi detector size to the receiver */
 	F_SET_RECEIVER_STREAMING_PORT, 	/** < sets the receiver streaming port */
+	F_RECEIVER_STREAMING_SRC_IP,	/** < sets the receiver streaming source IP */
 	/* Always append functions hereafter!!! */