eiger bug fix: 4 bit mode gap pixels, also added quad to shm

slsReceiverSoftware/include/DataStreamer.h

@@ -32,9 +32,10 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param sm pointer to silent mode
 	 * @param nd pointer to number of detectors in each dimension
 	 * @param gpEnable pointer to gap pixels enable
+	 * @param qe pointer to quad Enable
 	 */
 	DataStreamer(int ind, Fifo*& f, uint32_t* dr, std::vector<ROI>* r,
-			uint64_t* fi, int fd, char* ajh, bool* sm, int* nd, bool* gpEnable);
+			uint64_t* fi, int fd, char* ajh, bool* sm, int* nd, bool* gpEnable, bool* qe);
 
 	/**
 	 * Destructor
@@ -227,5 +228,7 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	/** Gap Pixels Enable */
 	bool* gapPixelsEnable;
 
+	/** quad enable */
+	bool* quadEnable;
 };
 

slsReceiverSoftware/include/ZmqSocket.h

@@ -274,7 +274,7 @@ public:
 			uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0,
 			uint32_t debug = 0, uint16_t roundRNumber = 0,
 			uint8_t detType = 0, uint8_t version = 0, uint32_t gapPixelsEnable = 0, uint32_t flippedDataX = 0, 
-			char* additionalJsonHeader = 0) {
+			uint32_t quadEnable = 0, char* additionalJsonHeader = 0) {
 
 
 		char buf[MAX_STR_LENGTH] = "";
@@ -308,7 +308,8 @@ public:
 
 		        //additional stuff
 				"\"gappixels\":%u, "
-		        "\"flippedDataX\":%u"
+		        "\"flippedDataX\":%u, "
+				"\"quad\":%u"
 
 				;//"}\n";
 		int length = sprintf(buf, jsonHeaderFormat,
@@ -321,7 +322,8 @@ public:
 
 						//additional stuff
 						gapPixelsEnable,
-						flippedDataX
+						flippedDataX,
+						quadEnable
 		);
 		if (additionalJsonHeader && strlen(additionalJsonHeader)) {
 		    length = sprintf(buf, "%s, %s}\n", buf, additionalJsonHeader);

slsReceiverSoftware/src/DataStreamer.cpp

@@ -16,7 +16,7 @@ const std::string DataStreamer::TypeName = "DataStreamer";
 
 
 DataStreamer::DataStreamer(int ind, Fifo*& f, uint32_t* dr, std::vector<ROI>* r,
-		uint64_t* fi, int fd, char* ajh, bool* sm, int* nd, bool* gpEnable) :
+		uint64_t* fi, int fd, char* ajh, bool* sm, int* nd, bool* gpEnable, bool* qe) :
 		ThreadObject(ind),
 		runningFlag(0),
 		generalData(0),
@@ -33,7 +33,8 @@ DataStreamer::DataStreamer(int ind, Fifo*& f, uint32_t* dr, std::vector<ROI>* r,
 		firstAcquisitionIndex(0),
 		firstMeasurementIndex(0),
 		completeBuffer(0),
-		gapPixelsEnable(gpEnable)
+		gapPixelsEnable(gpEnable),
+		quadEnable(qe)
 {
 	numDet[0] = nd[0];
 	numDet[1] = nd[1];
@@ -279,7 +280,7 @@ int DataStreamer::SendHeader(sls_receiver_header* rheader, uint32_t size, uint32
 			header.modId, header.row, header.column, header.reserved,
 			header.debug, header.roundRNumber,
 			header.detType, header.version,
-			*gapPixelsEnable ? 1 : 0, flippedDataX,
+			*gapPixelsEnable ? 1 : 0, flippedDataX, *quadEnable,
 			additionJsonHeader
 			);
 }

slsReceiverSoftware/src/UDPStandardImplementation.cpp

@@ -338,7 +338,7 @@ int UDPStandardImplementation::setDataStreamEnable(const bool enable) {
                         nd[1] = 2;
                     }
 		            DataStreamer* s = new DataStreamer(i, fifo[i], &dynamicRange,
-		                  &roi, &fileIndex, fd, additionalJsonHeader, &silentMode, (int*)nd, &gapPixelsEnable);
+		                  &roi, &fileIndex, fd, additionalJsonHeader, &silentMode, (int*)nd, &gapPixelsEnable, &quadEnable);
 		            dataStreamer.push_back(s);
 		            dataStreamer[i]->SetGeneralData(generalData);
 		            dataStreamer[i]->CreateZmqSockets(&numThreads, streamingPort, streamingSrcIP);