599 Commits

Author SHA1 Message Date
Erik Frojdh
9f724f0c0d using only sls exceptions 2019-03-14 17:09:44 +01:00
Erik Frojdh
bad44f5bf4 moving SharedMemory into namespace sls 2019-03-14 16:51:38 +01:00
Erik Frojdh
9639e480d9 new exceptions 2019-03-14 16:37:36 +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
d4e4fb8ffe move constructor deleted copy constructor 2019-03-12 14:37:06 +01:00
Erik Frojdh
3b2c734efd adding tests 2019-03-12 11:43:28 +01:00
Erik Frojdh
507a22ac05 default args 2019-03-12 10:14:24 +01:00
Erik Frojdh
a01d68a61f initial changes 2019-03-12 08:22:07 +01:00
d3c1193a71 ctb/moench server, fixed frequency configuring bug, readpattern sleep, detectormode command, jsonheader set even if rxr offline, set speed returnvalue is value not ok/fail, rxr printout missingpackets 64 bit 2019-03-06 10:25:16 +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
Erik Frojdh
b52c6b05b8 link and format 2019-02-16 16:46:09 +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
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
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
a1c0d28ddb changed constructor 2019-01-24 11:12:24 +01:00
Erik Frojdh
46036e5dde braces around statements 2019-01-21 11:41:19 +01:00
Erik Frojdh
d2ed245d1d format and removed nullptr check before delete 2019-01-21 11:18:27 +01:00
Erik Frojdh
b74aed91dc consistent naming between header and source file 2019-01-21 11:11:39 +01:00
Erik Frojdh
1b28cc88ff step one project reorganization 2019-01-18 14:41:04 +01:00
Erik Frojdh
10539f8533 new getDetectorType functions 2019-01-18 10:53:49 +01:00
Erik Frojdh
b07492be6f removing multiSlsDetectorCommand and using namespace std 2019-01-17 14:45:51 +01:00
Erik Frojdh
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
Erik Frojdh
b46fb5e9c4 deduce parallel call only on function signature and some const& 2019-01-11 12:33:11 +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
f815e7ffb6 long -> int64_t 2019-01-10 09:33:59 +01:00
Erik Frojdh
feaa276284 range based loops 2019-01-09 14:20:48 +01:00
Erik Frojdh
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
Erik Frojdh
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
Erik Frojdh
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
Erik Frojdh
3d40d5d058 format 2018-10-30 14:57:30 +01:00