4168 Commits

Author SHA1 Message Date
a37be4b2e3 fixed eiger server compiler errors 2018-11-08 17:22:59 +01:00
7a99d4155a fixed jungfrau server compile errors 2018-11-08 17:20:41 +01:00
91dd176a0f gotthard server done editing 2018-11-08 17:15:48 +01:00
a99584a0da removed ndac from sls_detector_module and from the servers (not used), fixed setting module by eiger bug in sending number of channels 2018-11-02 17:08:25 +01:00
d1c8d0b01c jungfrau virtual server compiles 2018-11-02 14:52:27 +01:00
833f0c164c reciever hdf5 compiling error fixed 2018-11-02 14:31:36 +01:00
742d4e6cb7 bug fix for mac addr format check 2018-11-02 14:13:59 +01:00
d55c39ef08 minor print fixe 2018-11-02 14:09:40 +01:00
a47db85350 gappixels only for eiger in receiver 2018-11-02 13:56:59 +01:00
b43be57b6e jungfrau server works 2018-11-02 13:50:00 +01:00
92123069ce virtual eiger server compiled 2018-10-31 15:13:31 +01:00
17027962ea log fix for eiger server 2018-10-31 15:02:43 +01:00
e0cbbde01d log fix for servers. eiger server done 2018-10-31 14:57:22 +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
Erik Frojdh
3d40d5d058 format 2018-10-30 14:57:30 +01:00
Erik Frojdh
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
dfa8cf7381 runs, prints right in reciever 2018-10-30 13:35: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
cf87b6ca83 still updating slsdetector.cpp 2018-10-25 16:24:05 +02:00
261849d69c eiger server compiles, client side of interface to do 2018-10-23 16:20:40 +02:00
Erik Frojdh
129e12fd97 moved test framework 2018-10-22 11:21:18 +02:00
Erik Frojdh
ab2eb607c8 replced usleep with chrono and thread 2018-10-19 15:47:36 +02:00
Erik Frojdh
5671f1c87b using split in add multiple detectors 2018-10-19 10:30:31 +02:00
Erik Frojdh
ff440f1325 clang-format on multi detector 2018-10-19 10:23:06 +02:00
dfad145e14 still in the process of interfacing det and client 2018-10-18 18:08:34 +02:00
Erik Frojdh
500304024d added base clang format 2018-10-18 17:06:43 +02:00
86fb843021 in the process of rewriting detector client interface 2018-10-18 10:58:48 +02:00
Erik Frojdh
c95bc84458 formatting 2018-10-17 18:13:01 +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
5c2ff84c0e removed unused variable numberofJobs in receiver implementation 2018-10-17 11:39:27 +02:00
Erik Frojdh
42c4e3e1a1 cleanup 2018-10-16 17:47:48 +02:00
Erik Frojdh
014dfaa251 moved to vector of unique pointer in slsReceiverImplementation 2018-10-16 17:30:43 +02:00
Erik Frojdh
b50d359ee6 better name 2018-10-16 15:53:01 +02:00
Erik Frojdh
b5a2c91873 removed printf with same source and dest 2018-10-16 15:50:51 +02:00
Erik Frojdh
3c9b1884d3 removed conditional operator and moved to range for 2018-10-16 15:25:15 +02:00
Erik Frojdh
66e79dc9a9 refactoring startReadout 2018-10-16 15:08:59 +02:00
Erik Frojdh
5b8dfd7943 range based for loops for reset acq count 2018-10-16 14:34:34 +02:00
178b832223 funcs name only in c++, bug fix:slsdetectorusers not deleting multislsdetectorcommand object, bug fix: programfpga does not delete fpgasrc malloc if returning in failure 2018-10-12 17:37:39 +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
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
4cdd766a8e cleaning readConfigFile 2018-10-12 09:57:46 +02:00
Erik Frojdh
c3289a973f cleaned up read config file slightly 2018-10-11 17:45:57 +02:00