|
|
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 |
|
|
|
a5ee9fbdba
|
ctb bug fixes: pattern generator, vchip, dacs
|
2019-02-07 16:51:18 +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
|
b74aed91dc
|
consistent naming between header and source file
|
2019-01-21 11:11:39 +01:00 |
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
|
d240ab7a29
|
moench server compiles
|
2019-01-15 20:06:11 +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 |
|
|
|
288ef0a514
|
acquiringDone not used, removing
|
2019-01-10 17:35:06 +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
|
26f8ca3221
|
clang-tidy fix from NULL 0 etc to nullptr
|
2019-01-09 12:02:49 +01:00 |
|
Erik Frojdh
|
3d40d5d058
|
format
|
2018-10-30 14:57:30 +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
|
ff440f1325
|
clang-format on multi detector
|
2018-10-19 10:23:06 +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
|
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
|
e921dbb6a7
|
minor
|
2018-10-11 16:46:34 +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 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
251a7c2446
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-03 15:28:22 +02:00 |
|
|
|
cf37725e04
|
updated command.cpp to have all the indices including default ones
|
2018-10-03 15:28:08 +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 |
|
