|
|
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 |
|
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 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
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 |
|
|
|
c24a9b223c
|
combined all the funcs into one, servers need to be recompiled
|
2018-10-11 13:57:47 +02:00 |
|
|
|
b82fca2c8e
|
removed warnings
|
2018-10-11 13:32:24 +02:00 |
|
|
|
576de404d4
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-11 12:25:27 +02:00 |
|
|
|
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 |
|
|
|
6d9530ee1d
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-10 12:24:20 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
64f4188a00
|
removed ms mutex , not used anyway
|
2018-10-10 10:16:41 +02:00 |
|
|
|
4bcc24a59f
|
some more changes, yet to do receiver
|
2018-10-09 12:31:12 +02:00 |
|
|
|
1c78400369
|
client compiles, more changes required
|
2018-10-08 09:34:08 +02:00 |
|
|
|
b5c35ddeac
|
slsdetector and users updated to reflect new signatures, not yet compiled
|
2018-10-05 15:28:25 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
