|
|
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 |
|
|
|
031a11c4f7
|
removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)
|
2019-02-12 11:09:19 +01:00 |
|
|
|
a64b34610a
|
merge from developer (without the additional json header implementations)
|
2019-02-12 09:35:24 +01:00 |
|
|
|
a5ee9fbdba
|
ctb bug fixes: pattern generator, vchip, dacs
|
2019-02-07 16:51:18 +01:00 |
|
|
|
0c1a3b7756
|
eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16
|
2019-02-06 17:07:13 +01:00 |
|
|
|
f1d055138c
|
moved updateDetector/Receiver
|
2019-01-25 19:12:28 +01:00 |
|
|
|
89ee1d5bcf
|
new socket for slsDetector
|
2019-01-25 16:44:29 +01:00 |
|
|
|
a1c0d28ddb
|
changed constructor
|
2019-01-24 11:12:24 +01:00 |
|
|
|
46036e5dde
|
braces around statements
|
2019-01-21 11:41:19 +01:00 |
|
|
|
d2ed245d1d
|
format and removed nullptr check before delete
|
2019-01-21 11:18:27 +01:00 |
|
|
|
b74aed91dc
|
consistent naming between header and source file
|
2019-01-21 11:11:39 +01:00 |
|
|
|
1b28cc88ff
|
step one project reorganization
|
2019-01-18 14:41:04 +01:00 |
|
|
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
|
b07492be6f
|
removing multiSlsDetectorCommand and using namespace std
|
2019-01-17 14:45:51 +01:00 |
|
|
|
76da6a07aa
|
using new CmdLineParser
|
2019-01-16 18:46:34 +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 |
|
|
|
b46fb5e9c4
|
deduce parallel call only on function signature and some const&
|
2019-01-11 12:33:11 +01:00 |
|
|
|
d01e8d24c2
|
const std::string& for filenames etc.
|
2019-01-10 16:38:37 +01:00 |
|
|
|
230c335c29
|
using default initializer arguments for multiSlsDetector
|
2019-01-10 15:53:09 +01:00 |
|
|
|
f815e7ffb6
|
long -> int64_t
|
2019-01-10 09:33:59 +01:00 |
|
|
|
feaa276284
|
range based loops
|
2019-01-09 14:20:48 +01:00 |
|
|
|
26f8ca3221
|
clang-tidy fix from NULL 0 etc to nullptr
|
2019-01-09 12:02:49 +01:00 |
|
|
|
bfda07d262
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-12-19 17:16:54 +01:00 |
|
|
|
84a67870a0
|
slight cleanup of dumpDetectorSetup
|
2018-12-19 16:38:18 +01:00 |
|
|
|
f161d68efc
|
fix in ltc, added moench, separated servers, left to do max1932, client side for moench and more detailed in ctb server side
|
2018-12-19 16:38:18 +01:00 |
|
|
|
1ca8bf204a
|
added string_utils and strcpy_safe
|
2018-12-19 15:44:21 +01:00 |
|
|
|
8f3f9caf2b
|
almost done with ctb update, need to do slow adcs, split to moench and ctb
|
2018-11-30 10:39:26 +01:00 |
|
|
|
aec8c031de
|
kept the same client interface:tb changed when fixing error codes/exceptions, modified multi print, fixed roi bug in indexing to sls
|
2018-10-31 14:30:30 +01:00 |
|
|
|
3d40d5d058
|
format
|
2018-10-30 14:57:30 +01:00 |
|
|
|
af550b4c70
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-30 14:46:19 +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 |
|
|
|
129e12fd97
|
moved test framework
|
2018-10-22 11:21:18 +02:00 |
|
|
|
ab2eb607c8
|
replced usleep with chrono and thread
|
2018-10-19 15:47:36 +02:00 |
|
|
|
5671f1c87b
|
using split in add multiple detectors
|
2018-10-19 10:30:31 +02:00 |
|
|
|
ff440f1325
|
clang-format on multi detector
|
2018-10-19 10:23:06 +02:00 |
|
|
|
c95bc84458
|
formatting
|
2018-10-17 18:13:01 +02:00 |
|
|
|
058de39d40
|
const qualifying
|
2018-10-17 17:51:26 +02:00 |
|
|
|
b44039361d
|
renamed joinThread getter setter
|
2018-10-17 17:47:19 +02:00 |
|
|
|
0070a79838
|
removed command threaded
|
2018-10-17 17:35:55 +02:00 |
|
|
|
1d14dc6ff4
|
void signature of processData
|
2018-10-17 16:58:09 +02:00 |
|
|
|
1d65063088
|
using std::mutex and std::thread in multi detector
|
2018-10-17 16:56:01 +02:00 |
|
|
|
8df63b7767
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-12 17:03:28 +02:00 |
|
|
|
8382d0f5f9
|
receiver tcp interface updated
|
2018-10-12 17:03:19 +02:00 |
|
|
|
1e2ffae690
|
setNetworkParameter dont split strings
|
2018-10-12 11:56:47 +02:00 |
|
|
|
f6357a667f
|
setSettingsDir works as the other functions
|
2018-10-12 11:39:11 +02:00 |
|
