merging refactor (replacing)

This commit is contained in:
2019-04-12 10:53:09 +02:00
parent 0bb800cc8a
commit 89a06f099c
1176 changed files with 82698 additions and 159058 deletions

34
slsReceiverSoftware/include/File.h Normal file → Executable file
View File

@ -8,13 +8,13 @@
*@short sets/gets properties for the file, creates/closes the file and writes data to it
*/
#include "sls_receiver_defs.h"
#include "sls_detector_defs.h"
#include "logger.h"
#include <string>
class File : private virtual slsReceiverDefs {
class File : private virtual slsDetectorDefs {
public:
/**
@ -53,7 +53,7 @@ class File : private virtual slsReceiverDefs {
/**
* Print all member values
*/
virtual void PrintMembers();
virtual void PrintMembers(TLogLevel level = logDEBUG1);
/**
* Get Type
@ -85,8 +85,8 @@ class File : private virtual slsReceiverDefs {
* @returns OK or FAIL
*/
virtual int CreateFile(uint64_t fnum){
cprintf(RED,"This is a generic function CreateFile that should be "
"overloaded by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function CreateFile that should be "
"overloaded by a derived class";
return OK;
}
@ -94,16 +94,16 @@ class File : private virtual slsReceiverDefs {
* Close Current File
*/
virtual void CloseCurrentFile() {
cprintf(RED,"This is a generic function CloseCurrentFile that should be "
"overloaded by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function CloseCurrentFile that should be "
"overloaded by a derived class";
}
/**
* Close Files
*/
virtual void CloseAllFiles() {
cprintf(RED,"This is a generic function that should be overloaded "
"by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function that should be overloaded "
"by a derived class";
}
/**
@ -114,8 +114,8 @@ class File : private virtual slsReceiverDefs {
* @param OK or FAIL
*/
virtual int WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t nump) {
cprintf(RED,"This is a generic function WriteToFile that "
"should be overloaded by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function WriteToFile that "
"should be overloaded by a derived class";
return FAIL;
}
@ -134,8 +134,8 @@ class File : private virtual slsReceiverDefs {
virtual int CreateMasterFile(bool en, uint32_t size,
uint32_t nx, uint32_t ny, uint64_t at, uint64_t st,
uint64_t sp, uint64_t ap) {
cprintf(RED,"This is a generic function CreateMasterFile that "
"should be overloaded by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function CreateMasterFile that "
"should be overloaded by a derived class";
return OK;
}
@ -146,8 +146,8 @@ class File : private virtual slsReceiverDefs {
* @param ny number of pixels in y direction
*/
virtual void SetNumberofPixels(uint32_t nx, uint32_t ny) {
cprintf(RED,"This is a generic function SetNumberofPixels that "
"should be overloaded by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function SetNumberofPixels that "
"should be overloaded by a derived class";
}
/**
@ -156,8 +156,8 @@ class File : private virtual slsReceiverDefs {
* @param numf number of images caught
*/
virtual void EndofAcquisition(bool anyPacketsCaught, uint64_t numf) {
cprintf(RED,"This is a generic function EndofAcquisition that "
"should be overloaded by a derived class\n");
FILE_LOG(logERROR) << "This is a generic function EndofAcquisition that "
"should be overloaded by a derived class";
}
protected: