rest implementation, index issues

slsReceiverSoftware/include/DataProcessor.h

@@ -24,7 +24,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	/**
 	 * Constructor
 	 * Calls Base Class CreateThread(), sets ErrorMask if error and increments NumberofDataProcessors
-	 * @param ind self index
 	 * @param f address of Fifo pointer
 	 * @param ftype pointer to file format type
 	 * @param fwenable pointer to file writer enable
@@ -32,7 +31,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param dataReadycb pointer to data ready call back function
 	 * @param pDataReadycb pointer to arguments of data ready call back function
 	 */
-	DataProcessor(int ind, Fifo*& f, fileFormat* ftype, bool* fwenable, bool* dsEnable,
+	DataProcessor(Fifo*& f, fileFormat* ftype, bool* fwenable, bool* dsEnable,
 						void (*dataReadycb)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t,
 								char*, uint32_t, void*),
 						void *pDataReadycb);

slsReceiverSoftware/include/DataStreamer.h

@@ -20,14 +20,13 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	/**
 	 * Constructor
 	 * Calls Base Class CreateThread(), sets ErrorMask if error and increments NumberofDataStreamers
-	 * @param ind self index
 	 * @param f address of Fifo pointer
 	 * @param dr pointer to dynamic range
 	 * @param freq pointer to streaming frequency
 	 * @param timer pointer to timer if streaming frequency is random
 	 * @param sEnable pointer to short frame enable
 	 */
-	DataStreamer(int ind, Fifo*& f, uint32_t* dr, uint32_t* freq, uint32_t* timer, int* sEnable);
+	DataStreamer(Fifo*& f, uint32_t* dr, uint32_t* freq, uint32_t* timer, int* sEnable);
 
 	/**
 	 * Destructor

slsReceiverSoftware/include/Fifo.h

@@ -20,12 +20,11 @@ class Fifo : private virtual slsReceiverDefs {
 	/**
 	 * Constructor
 	 * Calls CreateFifos that creates fifos and allocates memory
-	 * @param ind self index
 	 * @param fifoItemSize size of each fifo item
 	 * @param fifoDepth fifo depth
 	 * @param success true if successful, else false
 	 */
-	Fifo(int ind, uint32_t fifoItemSize, uint32_t fifoDepth, bool &success);
+	Fifo(uint32_t fifoItemSize, uint32_t fifoDepth, bool &success);
 
 	/**
 	 * Destructor

slsReceiverSoftware/include/Listener.h

@@ -21,7 +21,6 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	/**
 	 * Constructor
 	 * Calls Base Class CreateThread(), sets ErrorMask if error and increments NumberofListerners
-	 * @param ind self index
 	 * @param dtype detector type
 	 * @param f address of Fifo pointer
 	 * @param s pointer to receiver status
@@ -31,7 +30,7 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	 * @param nf pointer to number of images to catch
 	 * @param dr pointer to dynamic range
 	 */
-	Listener(int ind, detectorType dtype, Fifo*& f, runStatus* s, uint32_t* portno, char* e, int* act, uint64_t* nf, uint32_t* dr);
+	Listener(detectorType dtype, Fifo*& f, runStatus* s, uint32_t* portno, char* e, int* act, uint64_t* nf, uint32_t* dr);
 
 	/**
 	 * Destructor

slsReceiverSoftware/include/ThreadObject.h

@@ -19,8 +19,9 @@ class ThreadObject : private virtual slsReceiverDefs {
  public:
 	/**
 	 * Constructor
+	 * @param ind self index
 	 */
-	ThreadObject();
+	ThreadObject(int ind);
 
 	/**
 	 * Destructor

slsReceiverSoftware/include/UDPInterface.h

@@ -27,6 +27,29 @@ class UDPInterface {
 	 *
 	 *  UDPInterface *udp_interface = UDPInterface::create()
 	 *
+	 *  Sequence of Calls from client (upon setting receiver)
+	 *  -setDetectorType
+	 *  -setMultiDetectorSize
+	 *  -setDetectorPositionId
+	 *  -initialize
+	 *  -setUDPPortNumber,setUDPPortNumber2,setEthernetInterface
+	 *	-setFilePath
+	 *	-setFileName
+	 *	-setFileIndex
+	 *	-setFileFormat
+	 *	-setFileWriteEnable
+	 *	-setOverwriteEnable
+	 *	-setFrameIndexEnable
+	 *	-setAcquisitionPeriod
+	 *	-setNumberOfFrames
+	 *	-setAcquisitionTime
+	 *	-setDynamicRange
+	 *	-setFlippedData
+	 *	-setActivate
+	 *	-setTenGigaEnable
+	 *	-setStreamingPort
+	 *	-setDataStreamEnable
+	 *
 	 *
 	 *  supported sequence of method-calls:
 	 *

slsReceiverSoftware/include/UDPRESTImplementation.h

@@ -115,27 +115,9 @@ public:
 	 * Overridden method
 	 * Shuts down and deletes UDP Sockets
 	 * TCPIPInterface can also call this in case of illegal shutdown of receiver
-	 * @return OK or FAIL
 	 */
-	int shutDownUDPSockets();
+	void shutDownUDPSockets();
 
-	/**
-	 * Overridden method
-	 * Get the buffer-current frame read by receiver
-	 * @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(char* c,char** raw, uint64_t &startAcq, uint64_t &startFrame);
-
-	/**
-	 * Overridden method
-	 * Closes file / all files(data compression involves multiple files)
-	 * TCPIPInterface can also call this in case of illegal shutdown of receiver
-	 * @param i thread index valid for datacompression using root files, -1 for all threads
-	 */
-	void closeFile(int i = -1);
 
 	uint64_t getTotalFramesCaught() const;
 

slsReceiverSoftware/include/UDPStandardImplementation.h

@@ -177,7 +177,6 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
 
 	/**
 	 * Closes file / all files(data compression involves multiple files)
-	 * TCPIPInterface can also call this in case of illegal shutdown of receiver
 	 */
 	void closeFiles();
 
@@ -248,11 +247,6 @@ private:
 	/** Number of Jobs */
 	int numberofJobs;
 
-	//*** mutex ***
-	/** Status mutex */
-	pthread_mutex_t statusMutex;
-
-
 	//** class objects ***
 	/** General Data Properties */
 	GeneralData* generalData;