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

Fixed container (#19)

Browse Source 
* added FixedCapacityContainer

* added empty to FixedCapacityContainer

* removed commented out section

* added FixedCapacityContainer to public headers
This commit is contained in:
Erik Fröjdh
2019-05-08 12:34:45 +02:00
committed by Dhanya Thattil
parent 0e0e7ea81f
commit 2a1c89f712
6 changed files with 390 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/include/slsDetector.h
View File

@ -6,12 +6,14 @@
#include "logger.h"
#include "sls_detector_defs.h"
#include "network_utils.h"
#include "FixedCapacityContainer.h"
class ClientInterface;
#include <cmath>
#include <vector>
#include <array>
class multiSlsDetector;
class ServerInterface;
class MySocketTCP;
@ -62,11 +64,8 @@ struct sharedSlsDetector {
/** path of the trimbits/settings files */
char settingsDir[MAX_STR_LENGTH];
/** number of energies at which the detector has been trimmed */
int nTrimEn;
/** list of the energies at which the detector has been trimmed */
int trimEnergies[MAX_TRIMEN];
sls::FixedCapacityContainer<int, MAX_TRIMEN> trimEnergies;
/** number of channels per chip */
int nChans;