detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 17:47:59 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-07-02 09:13:47 +02:00
parent a373609b08
commit e22d03a744
20 changed files with 431 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/include/detectorData.h
View File

@ -18,14 +18,13 @@ class detectorData {
* @param fIndex file index
*/
detectorData(double progress, std::string fname, int x, int y, char *d, int dbytes, int dr, uint64_t fIndex) :
progressIndex(progress), fileName(fname), nx(x), ny(y), data(d), databytes(dbytes), dynamicRange(dr), gain(nullptr), fileIndex(fIndex) {};
progressIndex(progress), fileName(fname), fileIndex(fIndex), nx(x), ny(y), data(d), databytes(dbytes), dynamicRange(dr) {};
/**
* Destructor
* Also deletes gain
* data has to be deleted by caller
*/
~detectorData() {if(gain) delete [] gain;};
~detectorData() {};
int64_t getChannel(int i) {
int off=dynamicRange/8;
@ -54,7 +53,6 @@ class detectorData {
int nx;
int ny;
char* data;
double* gain;
int databytes;
int dynamicRange;
};

13
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -2093,16 +2093,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
void registerAcquisitionFinishedCallback(void (*func)(double, int, void *),
void *pArg);
/**
* register callback for accessing measurement final data
* @param func function to be called at the end of the acquisition.
* gets measurement index
* @param pArg argument
*/
void registerMeasurementFinishedCallback(void (*func)(int, void *),
void *pArg);
/**
* register callback for accessing detector progress
* @param func function to be called at the end of the acquisition.
@ -2302,9 +2292,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
void (*acquisition_finished)(double, int, void *){nullptr};
void *acqFinished_p{nullptr};
void (*measurement_finished)(int, void *){nullptr};
void *measFinished_p{nullptr};
void (*progress_call)(double, void *){nullptr};
void *pProgressCallArg{nullptr};

8
slsDetectorSoftware/include/slsDetectorUsers.h
View File

@ -823,14 +823,6 @@ public:
*/
void registerAcquisitionFinishedCallback(void( *func)(double,int, void*), void *pArg);
/**
* register callback for accessing measurement final data in client,
* @param func function to be called at the end of the acquisition.
* gets measurement index
* @param pArg argument
*/
void registerMeasurementFinishedCallback(void( *func)(int, void*), void *pArg);
/**
* register callback for accessing detector progress in client,
* @param func function to be called at the end of the acquisition.