 maliakal_d
|
debf3a1b01
|
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
|
2019-02-28 16:07:47 +01:00 |
|
|
maliakal_d
|
7f2197fc4f
|
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
|
2019-02-28 10:09:54 +01:00 |
|
|
maliakal_d
|
966896b942
|
moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr
|
2019-02-25 12:57:44 +01:00 |
|
 Erik Frojdh
|
29d4eb8b41
|
catch by ref
|
2019-02-20 10:29:15 +01:00 |
|
|
Samuel Debionne
|
f125b94a7d
|
Use sls::make_unique<>
|
2019-02-13 08:59:26 +01:00 |
|
|
Samuel Debionne
|
b18391330e
|
Add slsReceiverUsers(int tcpip_port_no) overload
Use std::unique_ptr<> instead of raw pointers
|
2019-02-12 17:01:46 +01:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
a64b34610a
|
merge from developer (without the additional json header implementations)
|
2019-02-12 09:35:24 +01:00 |
|
|
Erik Frojdh
|
c3472f295b
|
split client and server interface
|
2019-01-23 12:07:44 +01:00 |
|
|
Erik Frojdh
|
8d6ee6ff46
|
moved shm deleted .project
|
2019-01-18 11:40:10 +01:00 |
|
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
maliakal_d
|
13f9b9929a
|
slsreceiver: removed option to start receiver with config file, redundant as the only option is receiver tcp port
|
2019-01-17 15:17:08 +01:00 |
|
|
Erik Frojdh
|
49f71ffca7
|
project wide nullptr fix
|
2019-01-16 15:15:29 +01:00 |
|
|
maliakal_d
|
1ce8f3d092
|
udpSocket might still exist when error in creation, will conver to unique ptr later
|
2019-01-16 13:37:00 +01:00 |
|
|
Erik Frojdh
|
901785b818
|
only destroy sem if it was initialized
|
2019-01-16 11:51:50 +01:00 |
|
|
maliakal_d
|
5ae31bc438
|
receiver bug fix: dataprocess gappixels enable check to create tempbuffer always true
|
2019-01-11 15:21:16 +01:00 |
|
|
Erik Frojdh
|
0841df98d4
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-01-11 11:27:52 +01:00 |
|
|
Erik Frojdh
|
1bd0b33806
|
functions not overriding base and unitialized use
|
2019-01-11 11:27:48 +01:00 |
|
|
maliakal_d
|
de2ebad2ed
|
receiver: removed unused silentmode from DataStreamer
|
2019-01-11 11:19:16 +01:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
8f3f9caf2b
|
almost done with ctb update, need to do slow adcs, split to moench and ctb
|
2018-11-30 10:39:26 +01:00 |
|
|
maliakal_d
|
8942098a90
|
gotthard works, data to be authenticated when personnel available
|
2018-11-09 15:25:26 +01:00 |
|
|
maliakal_d
|
833f0c164c
|
reciever hdf5 compiling error fixed
|
2018-11-02 14:31:36 +01:00 |
|
|
maliakal_d
|
b43be57b6e
|
jungfrau server works
|
2018-11-02 13:50:00 +01:00 |
|
|
maliakal_d
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
maliakal_d
|
dfa8cf7381
|
runs, prints right in reciever
|
2018-10-30 13:35:20 +01:00 |
|
|
maliakal_d
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
maliakal_d
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
|
maliakal_d
|
cf87b6ca83
|
still updating slsdetector.cpp
|
2018-10-25 16:24:05 +02:00 |
|
|
maliakal_d
|
261849d69c
|
eiger server compiles, client side of interface to do
|
2018-10-23 16:20:40 +02:00 |
|
|
maliakal_d
|
86fb843021
|
in the process of rewriting detector client interface
|
2018-10-18 10:58:48 +02:00 |
|
|
Erik Frojdh
|
5c2ff84c0e
|
removed unused variable numberofJobs in receiver implementation
|
2018-10-17 11:39:27 +02:00 |
|
|
Erik Frojdh
|
42c4e3e1a1
|
cleanup
|
2018-10-16 17:47:48 +02:00 |
|
|
Erik Frojdh
|
014dfaa251
|
moved to vector of unique pointer in slsReceiverImplementation
|
2018-10-16 17:30:43 +02:00 |
|
|
Erik Frojdh
|
b50d359ee6
|
better name
|
2018-10-16 15:53:01 +02:00 |
|
|
Erik Frojdh
|
b5a2c91873
|
removed printf with same source and dest
|
2018-10-16 15:50:51 +02:00 |
|
|
Erik Frojdh
|
3c9b1884d3
|
removed conditional operator and moved to range for
|
2018-10-16 15:25:15 +02:00 |
|
|
Erik Frojdh
|
66e79dc9a9
|
refactoring startReadout
|
2018-10-16 15:08:59 +02:00 |
|
|
Erik Frojdh
|
5b8dfd7943
|
range based for loops for reset acq count
|
2018-10-16 14:34:34 +02:00 |
|
|
maliakal_d
|
8382d0f5f9
|
receiver tcp interface updated
|
2018-10-12 17:03:19 +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
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
maliakal_d
|
f69e9d0df4
|
refactored client interface (client ot receiveR)
|
2018-10-10 18:09:14 +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
|
b981fe78ef
|
connected command to execute command in receiver pc
|
2018-10-10 12:23:55 +02:00 |
|
|
maliakal_d
|
4b166b726e
|
bug fix, start receiver fail does not return
|
2018-10-10 11:24:17 +02:00 |
|
|
maliakal_d
|
17a6322f7c
|
receiver runs but does not overwrite due to wx, async doesnt seems parallel problem, acquire gets stuck
|
2018-10-10 10:12:58 +02:00 |
|
|
maliakal_d
|
8151f1d5fe
|
receiver compiles
|
2018-10-09 18:02:47 +02:00 |
|
|
maliakal_d
|
100c1b81f8
|
moved all the common header files from receiverSoftware to commonFiles
|
2018-10-02 16:32:37 +02:00 |
|