conflict resolution with developer

slsReceiverSoftware/include/BinaryFile.h

@@ -33,10 +33,12 @@ class BinaryFile : private virtual slsReceiverDefs, public File, public BinaryFi
 	 * @param nf pointer to number of images in acquisition
 	 * @param dr pointer to dynamic range
 	 * @param portno pointer to udp port number for logging
+	 * @param smode pointer to silent mode
 	 */
 	BinaryFile(int ind, uint32_t maxf, const uint32_t* ppf,
 			int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
-			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno);
+			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
+			bool* smode);
 
 	/**
 	 * Destructor

slsReceiverSoftware/include/DataProcessor.h

@@ -64,6 +64,12 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	static void ResetRunningMask();
 
+	/**
+	 * Set Silent Mode
+	 * @param mode 1 sets 0 unsets
+	 */
+	static void SetSilentMode(bool mode);
+
 	//*** non static functions ***
 	//*** getters ***
 	/**
@@ -284,6 +290,9 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
 	/** Fifo structure */
 	Fifo* fifo;
 
+	/** Silent Mode */
+	static bool SilentMode;
+
 
 	//individual members
 	/** File writer implemented as binary or hdf5 File */

slsReceiverSoftware/include/DataStreamer.h

@@ -51,6 +51,12 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	static void ResetRunningMask();
 
+	/**
+	 * Set Silent Mode
+	 * @param mode 1 sets 0 unsets
+	 */
+	static void SetSilentMode(bool mode);
+
 	//*** non static functions ***
 	//*** getters ***
 
@@ -181,6 +187,11 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	/** Fifo structure */
 	Fifo* fifo;
 
+	/** Silent Mode */
+	static bool SilentMode;
+
+
+
 	/** ZMQ Socket - Receiver to Client */
 	ZmqSocket* zmqSocket;
 

slsReceiverSoftware/include/File.h

@@ -33,10 +33,12 @@ class File : private virtual slsReceiverDefs {
 	 * @param nf pointer to number of images in acquisition
 	 * @param dr pointer to dynamic range
 	 * @param portno pointer to udp port number for logging
+	 * @param smode pointer to silent mode
 	 */
 	File(int ind, uint32_t maxf, const uint32_t* ppf,
 			int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
-			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno);
+			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
+			bool* smode);
 
 	/**
 	 * Destructor
@@ -213,5 +215,8 @@ class File : private virtual slsReceiverDefs {
 	/** UDP Port Number for logging */
 	uint32_t* udpPortNumber;
 
+	/** Silent Mode */
+	bool silentMode;
+
 };
 

slsReceiverSoftware/include/HDF5File.h

@@ -41,11 +41,13 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
 	 * @param portno pointer to udp port number for logging
 	 * @param nx number of pixels in x direction
 	 * @param ny number of pixels in y direction
+	 * @param smode pointer to silent mode
 	 */
 	HDF5File(int ind, uint32_t maxf, const uint32_t* ppf,
 			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);
+			uint32_t nx, uint32_t ny,
+			bool* smode);
 
 	/**
 	 * Destructor

slsReceiverSoftware/include/Listener.h

@@ -57,6 +57,12 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	 */
 	static void ResetRunningMask();
 
+	/**
+	 * Set Silent Mode
+	 * @param mode 1 sets 0 unsets
+	 */
+	static void SetSilentMode(bool mode);
+
 
 	//*** non static functions ***
 	//*** getters ***
@@ -217,6 +223,9 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	/** Fifo structure */
 	Fifo* fifo;
 
+	/** Silent Mode */
+	static bool SilentMode;
+
 
 	// individual members
 	/** Detector Type */
@@ -258,7 +267,7 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	uint64_t firstMeasurementIndex;
 
 
-	// for statistics
+	// for acquisition summary
 	/** Number of complete Packets caught for each real time acquisition (eg. for each scan (start& stop of receiver)) */
 	volatile uint64_t numPacketsCaught;
 
@@ -287,8 +296,12 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
 	/** if the udp socket is connected */
 	bool udpSocketAlive;
 
+
+	// for print progress during acqusition
+	/** number of packets for statistic */
 	uint32_t numPacketsStatistic;
 
+	/** number of images for statistic */
 	uint32_t numFramesStatistic;
 };
 

slsReceiverSoftware/include/UDPBaseImplementation.h

@@ -245,6 +245,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	runStatus getStatus() const;
 
+	/**
+	 * Get Silent Mode
+	 * @return silent mode
+	 */
+	uint32_t getSilentMode() const;
+
 	/**
 	 * Get activate
 	 * If deactivated, receiver will write dummy packets 0xFF
@@ -456,6 +462,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	 */
 	int setFifoDepth(const uint32_t i);
 
+	//***receiver parameters***
+	/**
+	 * Set Silent Mode
+	 * @param i silent mode. 1 sets, 0 unsets
+	 */
+	void setSilentMode(const uint32_t i);
 
 	/*************************************************************************
 	 * Behavioral functions***************************************************
@@ -671,6 +683,11 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
 	/** streaming port */
 	char streamingSrcIP[MAX_STR_LENGTH];
 
+	//***receiver parameters***
+	uint32_t silentMode;
+
+
+
 	//***callback parameters***
 	/**
 	 * Call back for start acquisition

slsReceiverSoftware/include/UDPInterface.h

@@ -331,6 +331,12 @@ class UDPInterface {
 	 */
 	virtual slsReceiverDefs::runStatus getStatus() const = 0;
 
+	/**
+	 * Get Silent Mode
+	 * @return silent mode
+	 */
+	virtual uint32_t getSilentMode() const = 0;
+
 	/**
 	 * Get activate
 	 * If deactivated, receiver will write dummy packets 0xFF
@@ -543,6 +549,14 @@ class UDPInterface {
 	virtual int setFifoDepth(const uint32_t i) = 0;
 
 
+	//***receiver parameters***
+	/**
+	 * Set Silent Mode
+	 * @param i silent mode. 1 sets, 0 unsets
+	 */
+	virtual void setSilentMode(const uint32_t i) = 0;
+
+
 	/*************************************************************************
 	 * Behavioral functions***************************************************
 	 * They may modify the status of the receiver ****************************

slsReceiverSoftware/include/UDPStandardImplementation.h

@@ -115,6 +115,12 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
 	 */
 	int setFifoDepth(const uint32_t i);
 
+	/**
+	 * Set Silent Mode
+	 * @param i silent mode. 1 sets, 0 unsets
+	 */
+	void setSilentMode(const uint32_t i);
+
 	/**
 	 * Set receiver type (and corresponding detector variables in derived STANDARD class)
 	 * It is the first function called by the client when connecting to receiver

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -261,6 +261,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
 	/** set streaming source ip */
 	int set_streaming_source_ip();
 
+	/** set silent mode */
+	int set_silent_mode();
+
 	/** enable gap pixels */
 	int enable_gap_pixels();
 

slsReceiverSoftware/include/sls_receiver_funcs.h

@@ -60,6 +60,7 @@ enum recFuncs{
 	F_SEND_RECEIVER_MULTIDETSIZE,    /** < sets the multi detector size to the receiver */
 	F_SET_RECEIVER_STREAMING_PORT, 	/** < sets the receiver streaming port */
 	F_RECEIVER_STREAMING_SRC_IP,	/** < sets the receiver streaming source IP */
+	F_SET_RECEIVER_SILENT_MODE,		/** < sets the receiver silent mode */
 	F_ENABLE_GAPPIXELS_IN_RECEIVER,	/** < sets gap pixels in the receiver */
 	/* Always append functions hereafter!!! */