detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 16:27:13 +02:00
Code Issues Actions Packages Releases Activity

cleaning

Browse Source
This commit is contained in:
Erik Frojdh
2020-03-11 18:10:37 +01:00
parent dc53887a48
commit f940397e3a
4 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/src/DetectorImpl.h
View File

@ -5,10 +5,6 @@
#include "logger.h"
#include "sls_detector_defs.h"
namespace sls{
class Module;
}
class ZmqSocket;
class detectorData;
@ -25,6 +21,11 @@ class detectorData;
#include <future>
#include <numeric>
namespace sls{
class Module;
/**
* @short structure allocated in shared memory to store detector settings
* for IPC and cache
@ -199,10 +200,6 @@ class DetectorImpl : public virtual slsDetectorDefs {
/** return multi detector shared memory ID */
int getMultiId() const;
std::string getPackageVersion() const;
int64_t getClientSoftwareVersion() const;
/** Free specific shared memory from the command line without creating object */
static void freeSharedMemory(int multiId, int detPos = -1);
@ -252,8 +249,6 @@ class DetectorImpl : public virtual slsDetectorDefs {
*/
bool enableDataStreamingToClient(int enable = -1);
void savePattern(const std::string &fname);
/**
* register callback for accessing acquisition final data
* @param func function to be called at the end of the acquisition.
@ -437,3 +432,5 @@ class DetectorImpl : public virtual slsDetectorDefs {
void (*dataReady)(detectorData *, uint64_t, uint32_t, void *){nullptr};
void *pCallbackArg{nullptr};
};
}//namespace sls