master hdf5 does not work, but so far good

slsReceiverSoftware/include/HDF5File.h

@@ -3,21 +3,30 @@
  * @short sets/gets properties for the HDF5 file,
  * creates/closes the file and writes data to it
  ***********************************************/
+//#define HDF5C
+//#ifdef HDF5C
 #ifndef HDF5_FILE_H
 #define HDF5_FILE_H
-
-#include "File.h"
-
 /**
  *@short sets/gets properties for the HDF5 file, creates/closes the file and writes data to it
  */
 
+
+#include "File.h"
+#include "H5Cpp.h"
+#ifndef H5_NO_NAMESPACE
+    using namespace H5;
+#endif
+
+#include <string>
+
 class HDF5File : private virtual slsReceiverDefs, public File {
 	
  public:
 	/**
 	 * Constructor
 	 * creates the File Writer
+	 * @param ind self index
 	 * @param fname pointer to file name prefix
 	 * @param fpath pointer to file path
 	 * @param findex pointer to file index
@@ -25,9 +34,14 @@ class HDF5File : private virtual slsReceiverDefs, public File {
 	 * @param owenable pointer to over write enable
 	 * @param dindex pointer to detector index
 	 * @param nunits pointer to number of theads/ units per detector
+	 * @param nf pointer to number of frames
+	 * @param dr dynamic range
+	 * @param nx number of pixels in x direction
+	 * @param ny number of pixels in y direction
 	 */
 	HDF5File(int ind, char* fname, char* fpath, uint64_t* findex,
-			bool* frindexenable, bool* owenable, int* dindex, int* nunits);
+			bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr,
+			int nx, int ny);
 
 	/**
 	 * Destructor
@@ -39,6 +53,13 @@ class HDF5File : private virtual slsReceiverDefs, public File {
 	 */
 	void PrintMembers();
 
+	/**
+	 * Set Number of pixels
+	 * @param nx number of pixels in x direction
+	 * @param ny number of pixels in y direction
+	 */
+	void SetNumberofPixels(uint32_t nx, uint32_t ny);
+
 	/**
 	 * Create file
 	 * @param fnum current frame index to include in file name
@@ -47,9 +68,23 @@ class HDF5File : private virtual slsReceiverDefs, public File {
 	int CreateFile(uint64_t fnum);
 
 	/**
-	 * Close File
+	 * Close Current File
 	 */
-	void CloseFile();
+	void CloseCurrentFile();
+
+	/**
+	 * Close all Files
+	 */
+	void CloseAllFiles();
+
+	/**
+	 * Write data to file
+	 * @param buffer buffer to write from
+	 * @param bsize size of buffer (not used)
+	 * @param fnum current image number
+	 * @returns OK or FAIL
+	 */
+	 int WriteToFile(char* buffer, int bsize, uint64_t fnum);
 
 	/**
 	 * Create File Name in format fpath/fnameprefix_fx_dy_z.raw,
@@ -69,16 +104,60 @@ class HDF5File : private virtual slsReceiverDefs, public File {
 
 	/**
 	 * Create File
+	 * @param ind object index for debugging
 	 * @param owenable overwrite enable
+	 * @param numf number of images
 	 * @param fname complete file name
+	 * @param fnum current image number
+	 * @param nx number of pixels in x dir
+	 * @param ny number of pixels in y dir
+	 * @param dtype data type
+	 * @param fd file pointer
+	 * @param dspace dataspace pointer
+	 * @param dset dataset pointer
 	 * @returns OK or FAIL
 	 */
-	static int CreateDataFile(bool owenable, char* fname);
+	static int CreateDataFile(int ind, bool owenable, uint64_t numf, std::string fname, uint64_t fnum, int nx, int ny,
+			DataType dtype, H5File*& fd, DataSpace*& dspace, DataSet*& dset);
 
 	/**
 	 * Close File
+	 * @param fd file pointer
+	 * @param dp dataspace pointer
+	 * @param ds dataset pointer
 	 */
-	static void CloseDataFile();
+
+	static void CloseDataFile(H5File*& fd, DataSpace*& dp, DataSet*& ds);
+
+	/**
+	 * Write data to file
+	 * @param ind object index for debugging
+	 * @param buf buffer to write from
+	 * @param numImages number of images
+	 * @param nx number of pixels in x direction
+	 * @param ny number of pixels in y direction
+	 * @param fnum current image number
+	 * @param dspace dataspace pointer
+	 * @param dset dataset pointer
+	 * @param dtype datatype
+	 * @returns OK or FAIL
+	 */
+	static int WriteDataFile(int ind, char* buf, uint64_t numImages, int nx, int ny, uint64_t fnum,
+			DataSpace* dspace, DataSet* dset, DataType dtype);
+
+	/**
+	 * Create common files
+	 * @param en ten giga enable
+	 * @param size image size
+	 * @param nx number of pixels in x direction
+	 * @param ny number of pixels in y direction
+	 * @param at acquisition time
+	 * @param ap acquisition period
+	 * @returns OK or FAIL
+	 */
+	int CreateCommonFiles(bool en, uint32_t size,
+				uint32_t nx, uint32_t ny, uint64_t at, uint64_t ap);
+
 
  private:
 
@@ -86,8 +165,73 @@ class HDF5File : private virtual slsReceiverDefs, public File {
 	 * Get Type
 	 * @return type
 	 */
-	fileFormat GetType();
+	fileFormat GetFileType();
 
+	/**
+	 * Updates data type depending on current dynamic range
+	 */
+	void UpdateDataType();
+
+	/**
+	 * Create file names for master and virtual file
+	 * @param m master file name
+	 * @param v virtual file name
+	 * @param fpath file path
+	 * @param fnameprefix file name prefix (includes scan and position variables)
+	 * @param findex file index
+	 */
+	void CreateCommonFileNames(std::string& m, std::string& v, char* fpath, char* fnameprefix, uint64_t findex);
+
+	 /*
+	  * Close master and virtual files
+	 */
+	void CloseCommonDataFiles();
+
+	/**
+	 * Create master and virtual files
+	 * @param m master file name
+	 * @param v virtual file name
+	 * @param owenable overwrite enable
+	 * @param tengigaEnable ten giga enable
+	 * @param imageSize image size
+	 * @param nPixelsX number of pixels in x direction
+	 * @param nPixelsY number of pixels in y direction
+	 * @param acquisitionTime acquisition time
+	 * @param acquisitionPeriod acquisition period
+	 * @returns OK or FAIL
+	 */
+	int CreateCommonDataFiles(std::string m, std::string v, bool owenable,
+			bool tengigaEnable,	uint32_t imageSize, uint32_t nPixelsX, uint32_t nPixelsY,
+			uint64_t acquisitionTime, uint64_t acquisitionPeriod);
+
+
+	/** mutex to update static items among objects (threads)*/
+	static pthread_mutex_t Mutex;
+
+	/** Master File handle */
+	static H5File* masterfd;
+
+	/** Virtual File handle */
+	static H5File* virtualfd;
+
+	/** File handle */
+	H5File* filefd;
+
+	/** Dataspace handle */
+	DataSpace* dataspace;
+
+	/** DataSet handle */
+	DataSet* dataset;
+
+	/** Datatype of dataset */
+	DataType datatype;
+
+	/** Number of pixels in x direction */
+	int nPixelsX;
+
+	/** Number of pixels in y direction */
+	int nPixelsY;
 };
 
+//#endif
 #endif