some changes for jctb

slsDetectorSoftware/slsDetector/slsDetector.h

@@ -522,7 +522,24 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
   };
 
 
- 
+  /** programs FPGA with pof file
+      \param fname file name
+      \returns OK or FAIL
+  */
+  int programFPGA(string fname);
+
+  /** resets FPGA
+      \returns OK or FAIL
+  */
+  int resetFPGA();
+
+  /** power on/off the chip
+     \param ival on is 1, off is 0, -1 to get
+      \returns OK or FAIL
+  */
+  int powerChip(int ival= -1);
+
+
   /** loads the modules settings/trimbits reading from a file  
       \param fname file name . If not specified, extension is automatically generated!
       \param imod module number, -1 means all modules
@@ -1580,15 +1597,18 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
  int resetFramesCaught();
 
  /**
-  * Reads a frame from receiver
-  * @param fName file name of current frame()
-  * @param acquisitionIndex current acquisition index
-  * @param frameIndex current frame index (for each scan)
-  * @param subFrameIndex current sub frame index (for 32 bit mode for eiger)
-  /returns a frame read from recever
- */
- int* readFrameFromReceiver(char* fName, int &acquisitionIndex, int &frameIndex, int &subFrameIndex);
+  * Create Receiving Data Threads
+  * @param destroy is true to destroy all the threads
+  * @return OK or FAIL
+  */
+ int createReceivingDataThreads(bool destroy = false){return 0;};
 
+
+ /** Reads frames from receiver through a constant socket
+ */
+ //void readFrameFromReceiver(){};
+
+ int* readFrameFromReceiver(char*, int&, int&, int&);
   /** Locks/Unlocks the connection to the receiver
       /param lock sets (1), usets (0), gets (-1) the lock
       /returns lock status of the receiver
@@ -1688,14 +1708,20 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
   char* setDetectorNetworkParameter(networkParameter index, int delay);
 
   /** Sets the read receiver frequency
-   	  if Receiver read upon gui request, readRxrFrequency=0,
+   	  if data required from receiver randomly readRxrFrequency=0,
    	   else every nth frame to be sent to gui
    	   @param getFromReceiver is 1 if it should ask the receiver,
-   	   0 if it can get it from multislsdetecter
-   	   @param i is the receiver read frequency
+   	   	   0 if it can get it from multi structure
+   	   @param freq is the receiver read frequency
    	   /returns read receiver frequency
    */
-  int setReadReceiverFrequency(int getFromReceiver, int i=-1);
+  int setReadReceiverFrequency(int getFromReceiver, int freq=-1);
+
+  /** Enable or disable streaming data from receiver to client
+   * 	@param enable 0 to disable 1 to enable -1 to only get the value
+   * 	@returns data streaming
+  */
+  int enableDataStreamingFromReceiver(int enable=-1);
 
   /** enable/disable or get data compression in receiver
    * @param i is -1 to get, 0 to disable and 1 to enable