Erik Frojdh
|
c153be95d1
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-15 10:15:50 +01:00 |
|
Erik Frojdh
|
4943983d10
|
det id const and ini shm in constructor
|
2019-03-15 10:15:42 +01:00 |
|
|
|
5fe7a86361
|
switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message
|
2019-03-15 10:00:22 +01:00 |
|
Erik Frojdh
|
bad44f5bf4
|
moving SharedMemory into namespace sls
|
2019-03-14 16:51:38 +01:00 |
|
Erik Frojdh
|
9a08c85b2a
|
changed the shared memory of slsDetector
|
2019-03-13 17:38:27 +01:00 |
|
|
|
f8aa0e3d6d
|
removed minor commented lines
|
2019-03-13 15:19:32 +01:00 |
|
Erik Frojdh
|
7e793539ca
|
removed typedef for shared struct
|
2019-03-12 14:42:27 +01:00 |
|
Erik Frojdh
|
48e4cec56f
|
minor
|
2019-03-12 11:52:13 +01:00 |
|
Erik Frojdh
|
3b2c734efd
|
adding tests
|
2019-03-12 11:43:28 +01:00 |
|
Erik Frojdh
|
a01d68a61f
|
initial changes
|
2019-03-12 08:22:07 +01:00 |
|
|
|
08bd2378f4
|
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
|
2019-03-04 09:41:20 +01:00 |
|
|
|
8c067437e6
|
ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions
|
2019-03-01 12:28:11 +01:00 |
|
|
|
35b1ad39f7
|
ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive
|
2019-03-01 10:45:01 +01:00 |
|
|
|
bb81613900
|
ctb, moench: implemented led enable feature
|
2019-03-01 09:00:04 +01:00 |
|
|
|
f5244faa02
|
moench: adding enums for zmq parameters, needs modification in naming
|
2019-02-21 16:01:24 +01:00 |
|
|
|
722883531d
|
reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings
|
2019-02-14 17:43:28 +01:00 |
|
|
|
46aa7769cc
|
client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future
|
2019-02-13 20:19:08 +01:00 |
|
|
|
f9be8b89ac
|
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
|
2019-02-13 09:37:31 +01:00 |
|
|
|
a5ee9fbdba
|
ctb bug fixes: pattern generator, vchip, dacs
|
2019-02-07 16:51:18 +01:00 |
|
Erik Frojdh
|
f1d055138c
|
moved updateDetector/Receiver
|
2019-01-25 19:12:28 +01:00 |
|
Erik Frojdh
|
89ee1d5bcf
|
new socket for slsDetector
|
2019-01-25 16:44:29 +01:00 |
|
Erik Frojdh
|
b74aed91dc
|
consistent naming between header and source file
|
2019-01-21 11:11:39 +01:00 |
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
|
d240ab7a29
|
moench server compiles
|
2019-01-15 20:06:11 +01:00 |
|
|
|
a9fb476543
|
changing signature from std::string to const std::string& for client receiver ip functions
|
2019-01-15 13:14:43 +01:00 |
|
|
|
c1c302f740
|
removing networkPArameter function complete
|
2019-01-14 20:42:15 +01:00 |
|
|
|
f0b29cfecc
|
signatures fixed for setnetworkparameter
|
2019-01-14 15:26:58 +01:00 |
|
|
|
3c41ec4a7a
|
in the process of splitting network parameter function
|
2019-01-14 10:03:40 +01:00 |
|
Erik Frojdh
|
b46fb5e9c4
|
deduce parallel call only on function signature and some const&
|
2019-01-11 12:33:11 +01:00 |
|
|
|
288ef0a514
|
acquiringDone not used, removing
|
2019-01-10 17:35:06 +01:00 |
|
Erik Frojdh
|
d01e8d24c2
|
const std::string& for filenames etc.
|
2019-01-10 16:38:37 +01:00 |
|
Erik Frojdh
|
230c335c29
|
using default initializer arguments for multiSlsDetector
|
2019-01-10 15:53:09 +01:00 |
|
Erik Frojdh
|
26f8ca3221
|
clang-tidy fix from NULL 0 etc to nullptr
|
2019-01-09 12:02:49 +01:00 |
|
Erik Frojdh
|
3d40d5d058
|
format
|
2018-10-30 14:57:30 +01:00 |
|
|
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
Erik Frojdh
|
ff440f1325
|
clang-format on multi detector
|
2018-10-19 10:23:06 +02:00 |
|
Erik Frojdh
|
058de39d40
|
const qualifying
|
2018-10-17 17:51:26 +02:00 |
|
Erik Frojdh
|
b44039361d
|
renamed joinThread getter setter
|
2018-10-17 17:47:19 +02:00 |
|
Erik Frojdh
|
0070a79838
|
removed command threaded
|
2018-10-17 17:35:55 +02:00 |
|
Erik Frojdh
|
1d14dc6ff4
|
void signature of processData
|
2018-10-17 16:58:09 +02:00 |
|
Erik Frojdh
|
1d65063088
|
using std::mutex and std::thread in multi detector
|
2018-10-17 16:56:01 +02:00 |
|
Erik Frojdh
|
1e2ffae690
|
setNetworkParameter dont split strings
|
2018-10-12 11:56:47 +02:00 |
|
Erik Frojdh
|
f6357a667f
|
setSettingsDir works as the other functions
|
2018-10-12 11:39:11 +02:00 |
|
Erik Frojdh
|
e921dbb6a7
|
minor
|
2018-10-11 16:46:34 +02:00 |
|
Erik Frojdh
|
f806759af3
|
const string&
|
2018-10-11 15:25:29 +02:00 |
|
Erik Frojdh
|
316ba01297
|
size of writeConfigFile
|
2018-10-11 15:19:26 +02:00 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
Erik Frojdh
|
5f6f276f70
|
moved initDetectorStructure into initSharedMemory
|
2018-10-10 17:41:13 +02:00 |
|
