removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.

slsReceiverSoftware/include/BinaryFile.h

@@ -27,7 +27,6 @@ class BinaryFile : private virtual slsReceiverDefs, public File, public BinaryFi
 	 * @param fname pointer to file name prefix
 	 * @param fpath pointer to file path
 	 * @param findex pointer to file index
-	 * @param frindexenable pointer to frame index enable
 	 * @param owenable pointer to over write enable
 	 * @param dindex pointer to detector index
 	 * @param nunits pointer to number of theads/ units per detector
@@ -36,8 +35,7 @@ class BinaryFile : private virtual slsReceiverDefs, public File, public BinaryFi
 	 * @param portno pointer to udp port number for logging
 	 */
 	BinaryFile(int ind, uint32_t maxf, const uint32_t* ppf,
-			int* nd, char* fname, char* fpath, uint64_t* findex,
-			bool* frindexenable, bool* owenable,
+			int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
 			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno);
 
 	/**

slsReceiverSoftware/include/DataProcessor.h

@@ -160,7 +160,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param fname pointer to file name prefix
 	 * @param fpath pointer to file path
 	 * @param findex pointer to file index
-	 * @param frindexenable pointer to frame index enable
 	 * @param owenable pointer to over write enable
 	 * @param dindex pointer to detector index
 	 * @param nunits pointer to number of theads/ units per detector
@@ -170,7 +169,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param g address of GeneralData (Detector Data) pointer
 	 */
 	void SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* findex,
-			bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g = 0);
+			 bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g = 0);
 
 
 	/**

slsReceiverSoftware/include/File.h

@@ -27,7 +27,6 @@ class File : private virtual slsReceiverDefs {
 	 * @param fname pointer to file name prefix
 	 * @param fpath pointer to file path
 	 * @param findex pointer to file index
-	 * @param frindexenable pointer to frame index enable
 	 * @param owenable pointer to over write enable
 	 * @param dindex pointer to detector index
 	 * @param nunits pointer to number of theads/ units per detector
@@ -36,8 +35,7 @@ class File : private virtual slsReceiverDefs {
 	 * @param portno pointer to udp port number for logging
 	 */
 	File(int ind, uint32_t maxf, const uint32_t* ppf,
-			int* nd, char* fname, char* fpath, uint64_t* findex,
-			bool* frindexenable, bool* owenable,
+			int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
 			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno);
 
 	/**
@@ -68,7 +66,6 @@ class File : private virtual slsReceiverDefs {
 	 * @param fname pointer to file name prefix
 	 * @param fpath pointer to file path
 	 * @param findex pointer to file index
-	 * @param frindexenable pointer to frame index enable
 	 * @param owenable pointer to over write enable
 	 * @param dindex pointer to detector index
 	 * @param nunits pointer to number of theads/ units per detector
@@ -76,8 +73,7 @@ class File : private virtual slsReceiverDefs {
 	 * @param dr pointer to dynamic range
 	 * @param portno pointer to dynamic range
 	 */
-	void GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*& findex,
-			bool*& frindexenable, bool*& owenable,
+	void GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*& findex, bool*& owenable,
 			int*& dindex, int*& nunits, uint64_t*& nf, uint32_t*& dr, uint32_t*& portno);
 
 	/**
@@ -199,9 +195,6 @@ class File : private virtual slsReceiverDefs {
 	/** File Index */
 	uint64_t* fileIndex;
 
-	/** Frame Index */
-	bool* frameIndexEnable;
-
 	/** Over write enable */
 	bool* overWriteEnable;
 

slsReceiverSoftware/include/HDF5File.h

@@ -33,7 +33,6 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
 	 * @param fname pointer to file name prefix
 	 * @param fpath pointer to file path
 	 * @param findex pointer to file index
-	 * @param frindexenable pointer to frame index enable
 	 * @param owenable pointer to over write enable
 	 * @param dindex pointer to detector index
 	 * @param nunits pointer to number of theads/ units per detector
@@ -44,8 +43,7 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
 	 * @param ny number of pixels in y direction
 	 */
 	HDF5File(int ind, uint32_t maxf, const uint32_t* ppf,
-			int* nd, char* fname, char* fpath, uint64_t* findex,
-			bool* frindexenable, bool* owenable,
+			int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
 			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
 			uint32_t nx, uint32_t ny);
 

slsReceiverSoftware/include/UDPBaseImplementation.h

@@ -97,12 +97,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	int getScanTag() const;
 
-	/**
-	 * Get if Frame Index is enabled (acquisition of more than 1 frame adds '_f000000000000' to file name )
-	 * @return true if frame index needed, else false
-	 */
-	bool getFrameIndexEnable() const;
-
 	/**
 	 * Get File Write Enable
 	 * @return true if file write enabled, else false
@@ -325,12 +319,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	void setScanTag(const int i);
 
-	/**
-	 * Set Frame Index Enable (acquisition of more than 1 frame adds '_f000000000000' to file name )
-	 * @param b true for frame index enable, else false
-	 */
-	void setFrameIndexEnable(const bool b);
-
 	/**
 	 * Set File Write Enable
 	 * @param b true for file write enable, else false
@@ -517,16 +505,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	void shutDownUDPSockets();
 
-	/**
-	 * Get the buffer-current frame read by receiver
-	 * @param ithread port thread index
-	 * @param c pointer to current file name
-	 * @param raw address of pointer, pointing to current frame to send to gui
-	 * @param startAcq start index of the acquisition
-	 * @param startFrame start index of the scan
-	 */
-	void readFrame(int ithread, char* c,char** raw, int64_t &startAcq, int64_t &startFrame);
-
 	/**
 	 * abort acquisition with minimum damage: close open files, cleanup.
 	 * does nothing if state already is 'idle'
@@ -657,8 +635,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	uint64_t fileIndex;
 	/** Scan Tag */
 	int scanTag;
-	/** Frame Index Enable */
-	bool frameIndexEnable;
 	/** File Write enable */
 	bool fileWriteEnable;
 	/** Overwrite enable */

slsReceiverSoftware/include/UDPInterface.h

@@ -39,7 +39,6 @@ class UDPInterface {
 	 *	-setFileFormat
 	 *	-setFileWriteEnable
 	 *	-setOverwriteEnable
-	 *	-setFrameIndexEnable
 	 *	-setAcquisitionPeriod
 	 *	-setNumberOfFrames
 	 *	-setAcquisitionTime
@@ -184,12 +183,6 @@ class UDPInterface {
 	 */
 	virtual int getScanTag() const = 0;
 
-	/**
-	 * Get if Frame Index is enabled (acquisition of more than 1 frame adds '_f000000000000' to file name )
-	 * @return true if frame index needed, else false
-	 */
-	virtual bool getFrameIndexEnable() const = 0;
-
 	/**
 	 * Get File Write Enable
 	 * @return true if file write enabled, else false
@@ -410,12 +403,6 @@ class UDPInterface {
 	 */
 	virtual void setScanTag(const int i) = 0;
 
-	/**
-	 * Set Frame Index Enable (acquisition of more than 1 frame adds '_f000000000000' to file name )
-	 * @param b true for frame index enable, else false
-	 */
-	virtual void setFrameIndexEnable(const bool b) = 0;
-
 	/**
 	 * Set File Write Enable
 	 * @param b true for file write enable, else false
@@ -602,16 +589,6 @@ class UDPInterface {
 	 */
 	virtual void shutDownUDPSockets() = 0;
 
-	/**
-	 * Get the buffer-current frame read by receiver
-	 * @param ithread port thread index
-	 * @param c pointer to current file name
-	 * @param raw address of pointer, pointing to current frame to send to gui
-	 * @param startAcq start index of the acquisition
-	 * @param startFrame start index of the scan
-	 */
-	virtual void readFrame(int ithread, char* c,char** raw, int64_t &startAcq, int64_t &startFrame)=0;
-
 	/**
 	 * abort acquisition with minimum damage: close open files, cleanup.
 	 * does nothing if state already is 'idle'

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -201,9 +201,6 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
 	 * when fifo is empty later, sets status to run_finished */
 	int start_readout();
 
-	/** Reads Frame/ buffer */
-	int	read_frame();
-
 	/** Set File path */
 	int set_file_dir();
 
@@ -213,9 +210,6 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
 	/** Set File index */
 	int set_file_index();
 
-	/** Set Frame index */
-	int set_frame_index();
-
 	/** Gets frame index for each acquisition */
 	int	get_frame_index();
 

slsReceiverSoftware/include/sls_receiver_funcs.h

@@ -35,13 +35,11 @@ enum recFuncs{
 	F_START_RECEIVER,				/**< starts the receiver listening mode */
 	F_STOP_RECEIVER,				/**< stops the receiver listening mode */
 	F_START_RECEIVER_READOUT, 		/**< acquisition has stopped. start remaining readout in receiver */
-	F_READ_RECEIVER_FRAME,  		/**< read one frame to gui*/
 
 	//file functions
 	F_SET_RECEIVER_FILE_PATH, 		/**< sets receiver file directory */
 	F_SET_RECEIVER_FILE_NAME, 		/**< sets receiver file name */
 	F_SET_RECEIVER_FILE_INDEX, 		/**< sets receiver file index */
-	F_SET_RECEIVER_FRAME_INDEX,		/**< sets the receiver frame index */
 	F_GET_RECEIVER_FRAME_INDEX,		/**< gets the receiver frame index */
 	F_GET_RECEIVER_FRAMES_CAUGHT,	/**< gets the number of frames caught by receiver */
 	F_RESET_RECEIVER_FRAMES_CAUGHT, /**< resets the frames caught by receiver */