Quad (#39)

* making quad work in developer branch

* binary added

* minor changes

* bug fix to set quad to 0 when more than 1 detector

slsReceiverSoftware/include/DataStreamer.h

@@ -27,11 +27,13 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
 	 * @param dr pointer to dynamic range
 	 * @param r roi
 	 * @param fi pointer to file index
-	 * @param fd flipped data enable for x and y dimensions
+	 * @param fd flipped data enable for x dimension
 	 * @param ajh additional json header
+	 * @param nd pointer to number of detectors in each dimension
+	 * @param gpEnable pointer to gap pixels enable
 	 */
 	DataStreamer(int ind, Fifo* f, uint32_t* dr, std::vector<ROI>* r,
-			uint64_t* fi, int* fd, char* ajh);
+			uint64_t* fi, int fd, char* ajh, int* nd, bool* gpEnable);
 
 	/**
 	 * Destructor
@@ -87,6 +89,18 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
 	 */
 	int SetThreadPriority(int priority);
 
+	/** 
+	 * Set number of detectors
+	 * @param number of detectors in both dimensions
+	 */
+	void SetNumberofDetectors(int* nd);
+
+	/** 
+	 * Set Flipped data enable across x dimension
+	 * @param flipped data enable in x dimension
+	 */
+	void SetFlippedDataX(int fd);	
+	
 	/**
 	 * Creates Zmq Sockets
 	 * (throws an exception if it couldnt create zmq sockets)
@@ -182,8 +196,8 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
 	/** Pointer to file index */
 	uint64_t* fileIndex;
 
-	/** flipped data across both dimensions enable */
-	int* flippedData;
+	/** flipped data across x axis */
+	int flippedDataX;
 
 	/** additional json header */
 	char* additionJsonHeader;
@@ -206,5 +220,11 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
 	/** Complete buffer used for roi, eg. shortGotthard */
 	char* completeBuffer;
 
+	/** Number of Detectors in X and Y dimension */
+	int numDet[2];
+
+	/** Gap Pixels Enable */
+	bool* gapPixelsEnable;
+
 };
 

slsReceiverSoftware/include/slsReceiverImplementation.h

@@ -74,6 +74,12 @@ class slsReceiverImplementation : private virtual slsDetectorDefs {
      */
     bool getGapPixelsEnable() const;
 
+    /**
+     * Get Quad type Enable (eiger and hardware specific)
+     * @return true if quad enabled, else false
+     */
+    bool getQuad() const;
+
     /**
      * Get readout flags (Eiger, chiptestboard, moench)
      * @return readout flags
@@ -390,6 +396,12 @@ class slsReceiverImplementation : private virtual slsDetectorDefs {
      */
     int setGapPixelsEnable(const bool b);
 
+    /**
+     * Set Quad type Enable (eiger and hardware specific)
+     * @param true if quad enabled, else false
+     */
+    void setQuad(const bool b);
+
     /**
      * Set readout flags (eiger, chiptestboard, moench)
      * @param f readout flag
@@ -868,10 +880,12 @@ class slsReceiverImplementation : private virtual slsDetectorDefs {
     bool tengigaEnable;
     /** Fifo Depth */
     uint32_t fifoDepth;
-    /** enable for flipping data across both axes */
-    int flippedData[2];
+    /** flipped data x across x axis (bottom eiger) */
+    int flippedDataX;
     /** gap pixels enable */
     bool gapPixelsEnable;
+    /** quad type enable */
+    bool quadEnable;   
     /** readout flags*/
     readOutFlags readoutFlags;
 

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -294,6 +294,9 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
     /** set dbit offset */
     int set_dbit_offset(sls::ServerInterface2 &socket);
 
+    /** quad type */
+    int set_quad_type(sls::ServerInterface2 &socket);
+
     /** detector type */
     detectorType myDetectorType;