WIP

slsReceiverSoftware/src/BinaryFile.h

@@ -9,7 +9,6 @@
  */
 
 #include "File.h"
-#include "BinaryFileStatic.h"
 
 #include <string>
 
@@ -38,39 +37,18 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi
 			int* nd, std::string* fname, std::string* fpath, uint64_t* findex, bool* owenable,
 			int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
 			bool* smode);
-
-	/**
-	 * Destructor
-	 */
 	~BinaryFile();
 
-	/**
-	 * Print all member values
-	 */
 	void PrintMembers(TLogLevel level = logDEBUG1) override;
-
-	/**
-	 * Create file
-	 */
 	void CreateFile() override;
-
 	 /**
 	  * Create master file
 	 * @param mfwenable master file write enable
 	 * @param attr master file attributes
 	  */
 	 void CreateMasterFile(bool mfwenable, masterAttributes& attr) override;
-
-	/**
-	 * Close Current File
-	 */
 	void CloseCurrentFile() override;
-
-	/**
-	 * Close all Files
-	 */
 	void CloseAllFiles() override;
-
 	/**
 	 * Write data to file
 	 * @param buffer buffer to write from
@@ -80,29 +58,16 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi
 	 */
 	 void WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t nump) override;
 
-
-
  private:
 
-	/**
-	 * Get Type
-	 * @return type
-	 */
-	 fileFormat GetFileType() override;
+	fileFormat GetFileType() override;
+	int WriteData(char* buf, int bsize);
 
-
-
-	/** File Descriptor */
 	FILE* filefd;
-
-	/** Master File Descriptor */
 	static FILE* masterfd;
-
-	/** Number of frames in file */
 	uint32_t numFramesInFile;
-
-	/** Number of actual packets caught in file */
 	uint64_t numActualPacketsInFile;
+	const int maxMasterFileSize;
 
 };