detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 07:38:04 +01:00
Code Issues Actions Packages Releases Activity

changed namings

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-02-10 10:41:01 +01:00
parent b260d08225
commit 54f92fb26c
11 changed files with 80 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsReceiverSoftware/include/BinaryFileWriter.h → slsReceiverSoftware/include/BinaryFile.h
View File

@@ -1,18 +1,18 @@
/************************************************
* @file BinaryFileWriter.h
* @file BinaryFile.h
* @short sets/gets properties for the binary file,
* creates/closes the file and writes data to it
***********************************************/
#ifndef BINARY_FILE_WRITER_H
#define BINARY_FILE_WRITER_H
#ifndef BINARY_FILE_H
#define BINARY_FILE_H
#include "FileWriter.h"
#include "File.h"
/**
*@short sets/gets properties for the binary file, creates/closes the file and writes data to it
*/
class BinaryFileWriter : private virtual slsReceiverDefs, public FileWriter {
class BinaryFile : private virtual slsReceiverDefs, public File {
public:
/**
@@ -28,13 +28,13 @@ class BinaryFileWriter : private virtual slsReceiverDefs, public FileWriter {
* @param nunits pointer to number of theads/ units per detector
* @param maxf pointer to max frames per file
*/
BinaryFileWriter(int ind, char* fname, char* fpath, uint64_t* findex,
BinaryFile(int ind, char* fname, char* fpath, uint64_t* findex,
bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint32_t maxf);
/**
* Destructor
*/
~BinaryFileWriter();
~BinaryFile();
/**
* Print all member values

6
slsReceiverSoftware/include/DataProcessor.h
View File

@@ -14,7 +14,7 @@
class GeneralData;
class Fifo;
class FileWriter;
class File;
#include <vector>
@@ -260,8 +260,8 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
/** Frame Number of latest processed frame number of an entire Acquisition (including all scans) */
uint64_t currentFrameIndex;
/** File writer implemented as binary or hdf5 filewriter */
FileWriter* fileWriter;
/** File writer implemented as binary or hdf5 File */
File* file;
/** File Format Type */
fileFormat* fileFormatType;

12
slsReceiverSoftware/include/FileWriter.h → slsReceiverSoftware/include/File.h
View File

@@ -1,10 +1,10 @@
/************************************************
* @file FileWriter.h
* @file File.h
* @short sets/gets properties for the file,
* creates/closes the file and writes data to it
***********************************************/
#ifndef FILE_WRITER_H
#define FILE_WRITER_H
#ifndef FILE_H
#define FILE_H
/**
*@short sets/gets properties for the file, creates/closes the file and writes data to it
*/
@@ -15,7 +15,7 @@
#include <string>
class FileWriter : private virtual slsReceiverDefs {
class File : private virtual slsReceiverDefs {
public:
/**
@@ -30,13 +30,13 @@ class FileWriter : private virtual slsReceiverDefs {
* @param dindex pointer to detector index
* @param nunits pointer to number of theads/ units per detector
*/
FileWriter(int ind, char* fname, char* fpath, uint64_t* findex,
File(int ind, char* fname, char* fpath, uint64_t* findex,
bool* frindexenable, bool* owenable, int* dindex, int* nunits);
/**
* Destructor
*/
virtual ~FileWriter();
virtual ~File();
/**
* Get Current File Name

32
slsReceiverSoftware/include/FileReader.h
View File

@@ -1,32 +0,0 @@
/********************************************//**
* @file FileWriter.h
* @short sets/gets properties for the file, creates/closes the file and writes data to it
***********************************************/
#ifndef FILE_WRITER_H
#define FILE_WRITER_H
/**
*@short sets/gets properties for the file, creates/closes the file and writes data to it
*/
class FileWriter : private virtual slsReceiverDefs {
public:
/**
* Constructor
* creates the File Writer
*/
FileWriter();
/**
* Destructor
*/
~FileWriter();
private:
};
#endif

14
slsReceiverSoftware/include/HDF5FileWriter.h → slsReceiverSoftware/include/HDF5File.h
View File

@@ -1,18 +1,18 @@
/************************************************
* @file HDF5FileWriter.h
* @file HDF5File.h
* @short sets/gets properties for the HDF5 file,
* creates/closes the file and writes data to it
***********************************************/
#ifndef HDF5_FILE_WRITER_H
#define HDF5_FILE_WRITER_H
#ifndef HDF5_FILE_H
#define HDF5_FILE_H
#include "FileWriter.h"
#include "File.h"
/**
*@short sets/gets properties for the HDF5 file, creates/closes the file and writes data to it
*/
class HDF5FileWriter : private virtual slsReceiverDefs, public FileWriter {
class HDF5File : private virtual slsReceiverDefs, public File {
public:
/**
@@ -26,13 +26,13 @@ class HDF5FileWriter : private virtual slsReceiverDefs, public FileWriter {
* @param dindex pointer to detector index
* @param nunits pointer to number of theads/ units per detector
*/
HDF5FileWriter(int ind, char* fname, char* fpath, uint64_t* findex,
HDF5File(int ind, char* fname, char* fpath, uint64_t* findex,
bool* frindexenable, bool* owenable, int* dindex, int* nunits);
/**
* Destructor
*/
~HDF5FileWriter();
~HDF5File();
/**
* Print all member values