master file option, adcdisable changed to adcenable

slsReceiverSoftware/include/BinaryFile.h

@@ -58,6 +58,7 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi
 
 	 /**
 	  * Create master file
+	 * @param mfwenable master file write enable
 	 * @param en ten giga enable
 	 * @param size image size
 	 * @param nx number of pixels in x direction
@@ -68,7 +69,7 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi
 	 * @param ap acquisition period
 	  * @returns OK or FAIL
 	  */
-	 int CreateMasterFile(bool en, uint32_t size,
+	 int CreateMasterFile(bool mfwenable, bool en, uint32_t size,
 				uint32_t nx, uint32_t ny, uint64_t at, uint64_t st, uint64_t sp,
 				uint64_t ap);
 

slsReceiverSoftware/include/DataProcessor.h

@@ -29,6 +29,7 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
 	 * @param f address of Fifo pointer
 	 * @param ftype pointer to file format type
 	 * @param fwenable file writer enable
+	 * @apram mfwenable pointer to master file write enable
 	 * @param dsEnable pointer to data stream enable
 	 * @param gpEnable pointer to gap pixels enable
 	 * @param dr pointer to dynamic range
@@ -40,7 +41,7 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
 	 * @param sm pointer to silent mode
 	 */
 	DataProcessor(int ind, detectorType dtype, Fifo* f, fileFormat* ftype,
-			bool fwenable, bool* dsEnable, bool* gpEnable, uint32_t* dr,
+			bool fwenable, bool* mfwenable, bool* dsEnable, bool* gpEnable, uint32_t* dr,
 						uint32_t* freq, uint32_t* timer,
 						bool* fp, bool* act, bool* depaden, bool* sm);
 
@@ -325,6 +326,9 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
 	/** File Write Enable */
 	bool fileWriteEnable;
 
+	/** Master File Write Enable */
+	bool* masterFileWriteEnable;
+
 	/** Gap Pixels Enable */
 	bool* gapPixelsEnable;
 

slsReceiverSoftware/include/File.h

@@ -121,6 +121,7 @@ class File : private virtual slsDetectorDefs {
 
 	 /**
 	  * Create master file
+	  * @param mfwenable master file write enable
 	  * @param en ten giga enable
 	  * @param size image size
 	  * @param nx number of pixels in x direction
@@ -131,7 +132,7 @@ class File : private virtual slsDetectorDefs {
 	  * @param ap acquisition period
 	  * @returns OK or FAIL
 	  */
-	virtual int CreateMasterFile(bool en, uint32_t size,
+	virtual int CreateMasterFile(bool mfwenable, bool en, uint32_t size,
 				uint32_t nx, uint32_t ny, uint64_t at, uint64_t st,
 				uint64_t sp, uint64_t ap) {
 		FILE_LOG(logERROR) << "This is a generic function CreateMasterFile that "

slsReceiverSoftware/include/HDF5File.h

@@ -93,6 +93,7 @@ class HDF5File : private virtual slsDetectorDefs, public File, public HDF5FileSt
 
 	/**
 	 * Create master file
+	 * @param mfwenable master file write enable
 	 * @param en ten giga enable
 	 * @param size image size
 	 * @param nx number of pixels in x direction
@@ -103,7 +104,7 @@ class HDF5File : private virtual slsDetectorDefs, public File, public HDF5FileSt
 	 * @param ap acquisition period
 	 * @returns OK or FAIL
 	 */
-	int CreateMasterFile(bool en, uint32_t size,
+	int CreateMasterFile(bool mfwenable, bool en, uint32_t size,
 			uint32_t nx, uint32_t ny, uint64_t at, uint64_t st, uint64_t sp,
 			uint64_t ap);
 

slsReceiverSoftware/include/slsReceiverImplementation.h

@@ -128,6 +128,12 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
 	 */
 	bool getFileWriteEnable() const;
 
+	/**
+	 * Get Master File Write Enable
+	 * @return true if Master file write enabled, else false
+	 */
+	bool getMasterFileWriteEnable() const;
+
 	/**
 	 * Get File Over Write Enable
 	 * @return true if file over write enabled, else false
@@ -426,6 +432,12 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
 	 */
 	void setFileWriteEnable(const bool b);
 
+		/**
+	 * Set Master File Write Enable
+	 * @param b true for Master file write enable, else false
+	 */
+	void setMasterFileWriteEnable(const bool b);
+
 	/**
 	 * Set File Overwrite Enable
 	 * @param b true for file overwrite enable, else false
@@ -862,6 +874,8 @@ private:
 	uint32_t framesPerFile;
 	/** File Write enable */
 	bool fileWriteEnable;
+	/** MasterFile Write enable */
+	bool masterFileWriteEnable;	
 	/** Overwrite enable */
 	bool overwriteEnable;
 

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -204,6 +204,9 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
 	/** Enable File Write*/
 	int enable_file_write();
 
+	/** Enable Master File Write */
+	int enable_master_file_write();
+
 	/** enable compression */
 	int enable_compression();