Commit Graph

560 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 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
maliakal_d c24a9b223c combined all the funcs into one, servers need to be recompiled 2018-10-11 13:57:47 +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 6aa0029580 changing pointers to local variables 2018-10-11 12:08:07 +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
Erik Frojdh 2cd0841ea3 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-10 12:17:36 +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 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
Erik Frojdh d685cb8ff4 moved detectors and zmqSocket to unique pointers 2018-10-10 11:55:37 +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 64f4188a00 removed ms mutex , not used anyway 2018-10-10 10:16:41 +02:00
maliakal_d 4bcc24a59f some more changes, yet to do receiver 2018-10-09 12:31:12 +02:00
maliakal_d 1c78400369 client compiles, more changes required 2018-10-08 09:34:08 +02:00
maliakal_d b5c35ddeac slsdetector and users updated to reflect new signatures, not yet compiled 2018-10-05 15:28:25 +02:00
maliakal_d ab8b07f2ee client multi is updated with argument c++11 threading, need to update sls detector with arguments and removing imod 2018-10-04 17:24:37 +02:00
maliakal_d 1c70f9ec65 mutli.cpp updated half (without masking multi error and no check on detectors boundaries for adding exceptions later. done upto savecalibrationfile 2018-10-03 17:56:04 +02:00
maliakal_d 251a7c2446 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-03 15:28:22 +02:00
maliakal_d cf37725e04 updated command.cpp to have all the indices including default ones 2018-10-03 15:28:08 +02:00
Erik Frojdh 287cd118b0 example 2018-10-03 14:56:56 +02:00
Erik Frojdh 02acaf13c5 added example 2018-10-03 14:51:35 +02:00
Erik Frojdh fefdf8e7d6 slsSupportLib and parallel call using variadic templates 2018-10-03 14:02:41 +02:00
maliakal_d 6bfc212f19 client multi.cpp some more changes 2018-10-03 12:53:50 +02:00
maliakal_d a1b24a637b client multi.cpp modified common out of bounds error 2018-10-03 12:47:20 +02:00
maliakal_d 40ae74bb99 client multi.cpp getid and checkversioncompatibility are examples of how it might look like 2018-10-03 12:31:00 +02:00
maliakal_d 586c664a43 client multi.h comments and some signature updated 2018-10-03 11:57:18 +02:00
maliakal_d fdcd633769 client: multi added indices for detpos in function signature for required 2018-10-03 11:41:50 +02:00
maliakal_d 70ea4b48c3 client: removed slsDetectorutils and postprocessing. yet to compile, yet to add detpos index for every multi sls detector command and call from command interface, removed multiple threading, yet to interface with eriks single template for multiple threading 2018-10-03 11:15:39 +02:00
maliakal_d dafbc970e3 client stage2 ongoing, utils removed but not compile ready; left to do imod for every multi, connect client to multi 2018-10-02 18:13:00 +02:00
maliakal_d c248b12455 refactored ONLY THE CLIENT first stage, compiles 2018-10-02 15:15:35 +02:00
maliakal_d f9b95b63eb gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all 2018-09-27 18:20:03 +02:00
maliakal_d c2db073d5e receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved 2018-09-26 15:03:04 +02:00
Erik Frojdh 64229ca32b changed operator() to const 2018-09-25 11:20:44 +02:00
maliakal_d c784f0f539 client: moved shortenable to roi in reciever, roi not yet written in master file 2018-09-19 17:35:26 +02:00
maliakal_d 59cb9c84c2 bug fix slsdetectorgui: xcoord and y coord are actually col and row indices 2018-09-17 14:35:31 +02:00
maliakal_d 63c130a380 client:updated users class and release.txt 2018-08-22 18:08:35 +02:00