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

changed the shared memory of slsDetector

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-13 17:38:27 +01:00
parent 85134443de
commit 9a08c85b2a
5 changed files with 1110 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2051
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

51
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -29,7 +29,7 @@ class MySocketTCP;
/**
* parameter list that has to be initialized depending on the detector type
*/
typedef struct detParameterList {
struct detParameterList {
int nChanX;
int nChanY;
int nChipX;
@ -38,7 +38,7 @@ typedef struct detParameterList {
int dynamicRange;
int nGappixelsX;
int nGappixelsY;
} detParameterList;
};
/**
* @short structure allocated in shared memory to store detector settings for IPC and cache
@ -134,15 +134,6 @@ struct sharedSlsDetector {
/** timer values */
int64_t timerValue[slsDetectorDefs::timerIndex::MAX_TIMERS];
/** memory offsets for the module structures */
int modoff;
/** memory offsets for the dac arrays */
int dacoff;
/** memory offsets for the channel register arrays -trimbits*/
int chanoff;
/** ip address/hostname of the receiver for client control via TCP */
char receiver_hostname[MAX_STR_LENGTH];
@ -1648,7 +1639,7 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
* @param verify true to verify if shm size matches existing one
* @returns true if the shared memory was created now
*/
void initSharedMemory(bool created, detectorType type, int multiId, bool verify = true);
void initSharedMemory(detectorType type, int multiId, bool verify = true);
/**
* Sets detector parameters depending detector type
@ -1657,13 +1648,6 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
*/
void setDetectorSpecificParameters(detectorType type, detParameterList &list);
/**
* Calculate shared memory size based on detector type
* @param type type of detector
* @returns size of shared memory of sharedSlsDetector structure
*/
int calculateSharedMemorySize(detectorType type);
/**
* Initialize detector structure to defaults
* Called when new shared memory is created
@ -1671,24 +1655,10 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
*/
void initializeDetectorStructure(detectorType type);
/**
* Initialize class members (and from parent classes)
* Also connect member pointers to detector structure pointers
* Called when shared memory created/existed
*/
void initializeMembers();
/**
* Initialize detector structure
* Called when new shared memory created
* Initializes the member pointers to defaults as well
*/
void initializeDetectorStructurePointers();
/**
* Allocates the memory for a sls_detector_module structure and initializes it
* Uses current detector type
* @returns myMod the pointer to the allocate dmemory location
* @returns myMod the pointer to the allocate memory location
*/
sls_detector_module *createModule();
@ -1775,19 +1745,8 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
int detId;
/** Shared Memory object */
SharedMemory<sharedSlsDetector> *sharedMemory{nullptr};
SharedMemory<sharedSlsDetector> detector_shm{0,0};
/** Shared memory structure */
sharedSlsDetector *thisDetector{nullptr};
/** pointer to detector module structures in shared memory */
// sls_detector_module *detectorModules{nullptr};
/** pointer to dac valuse in shared memory */
// int *dacs{nullptr};
/** pointer to channel registers in shared memory */
// int *chanregs{nullptr};
};
#endif