Commit Graph

4124 Commits

Author SHA1 Message Date
maliakal_d 8df63b7767 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-12 17:03:28 +02:00
maliakal_d 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
Erik Frojdh e921dbb6a7 minor 2018-10-11 16:46:34 +02:00
Erik Frojdh 1895ee1ebe minor 2018-10-11 16:19:44 +02:00
Erik Frojdh 22e8c52bd8 more style 2018-10-11 16:08:02 +02:00
maliakal_d c31c851e88 moved communication, jungfrau 2018-10-11 15:58:49 +02:00
maliakal_d 565739f6a2 eiger server, moved comunication_funcs 2018-10-11 15:55:08 +02:00
maliakal_d 43c6cae25b Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 15:53:42 +02:00
maliakal_d d2c8c0a2eb gotthard server, moved communication_funcs to slsDetectorServer 2018-10-11 15:53:30 +02:00
Erik Frojdh d96cbe02a2 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 15:52:48 +02:00
Erik Frojdh 795e147e7d stylistic cleanup 2018-10-11 15:52:39 +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
Erik Frojdh a28932bb6c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 14:43:47 +02:00
Erik Frojdh 4d69b6d3a1 added address sanitizer for debug mode 2018-10-11 14:43:32 +02:00
maliakal_d 302f31678f updated gotthard binary, not run 2018-10-11 14:40:52 +02:00
maliakal_d 32924def33 updated jungfrau server binary 2018-10-11 14:33:13 +02:00
maliakal_d ee20932392 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 14:20:58 +02:00
maliakal_d 0ee7f67965 detector servers moved out of slsdetector software, eiger server compiles with new headers 2018-10-11 14:20:50 +02:00
maliakal_d c24a9b223c combined all the funcs into one, servers need to be recompiled 2018-10-11 13:57:47 +02:00
Erik Frojdh f7809bda3b Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 13:54:37 +02:00
Erik Frojdh 5682466356 remove pointers and try block from get detector type 2018-10-11 13:54:25 +02:00
maliakal_d b82fca2c8e removed warnings 2018-10-11 13:32:24 +02:00
maliakal_d 576de404d4 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 12:25:27 +02:00
maliakal_d 5a356534e6 refactor receiver client interface, moved defs into one sls_detector_defs.h 2018-10-11 12:25:18 +02:00
Erik Frojdh f735c86b93 removing more pointers 2018-10-11 12:14:46 +02:00
Erik Frojdh 6aa0029580 changing pointers to local variables 2018-10-11 12:08:07 +02:00
Erik Frojdh 2216574d34 check empty instead of strcmp 2018-10-11 11:51:54 +02:00
maliakal_d d0950ba001 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-10 18:11:23 +02:00
maliakal_d f69e9d0df4 refactored client interface (client ot receiveR) 2018-10-10 18:09:14 +02:00
Erik Frojdh 8dc0d72028 minor formatting 2018-10-10 17:46:28 +02:00
Erik Frojdh 5f6f276f70 moved initDetectorStructure into initSharedMemory 2018-10-10 17:41:13 +02:00
Erik Frojdh fd7060ef6c removed pointer to shared memory in some multi functions 2018-10-10 14:18:47 +02:00
maliakal_d e1d570e8ce client specifies index of receiver returned error, skeleton of including clientinterface in receiver 2018-10-10 13:15:16 +02:00
maliakal_d 6d9530ee1d Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-10 12:24:20 +02:00
maliakal_d b981fe78ef connected command to execute command in receiver pc 2018-10-10 12:23:55 +02:00
Erik Frojdh 2cd0841ea3 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-10 12:17:36 +02:00
Erik Frojdh 74bd223fda minor cleanup 2018-10-10 12:17:28 +02:00
Erik Frojdh 6147383677 commented out concatResultOrPos which seems not to be used 2018-10-10 12:01:30 +02:00
maliakal_d 5e7e7d3c33 moved client interface to common folder as receiver wills tart using it as well 2018-10-10 12:00:47 +02:00
Erik Frojdh 938dd5e06c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-10 11:55:49 +02:00
Erik Frojdh d685cb8ff4 moved detectors and zmqSocket to unique pointers 2018-10-10 11:55:37 +02:00
maliakal_d 78bfc9d0a5 insignificant, renamed recieverInterface to have a capital letter in class name 2018-10-10 11:43:35 +02:00
maliakal_d 4b166b726e bug fix, start receiver fail does not return 2018-10-10 11:24:17 +02:00
maliakal_d 9ca163dfc9 adding std::launch:async parameter to make it parallel by default for sl7 (seems default for fedora) 2018-10-10 10:51:32 +02:00
maliakal_d f2da42a305 overwrite enabled by default 2018-10-10 10:28:38 +02:00