 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 |
|
 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
|
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
|
1b28cc88ff
|
step one project reorganization
|
2019-01-18 14:41:04 +01:00 |
|
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +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 |
|
|
Erik Frojdh
|
c6a597c3ec
|
minor changes and removed W flag not found
|
2019-01-11 11:07:50 +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
|
833f0c164c
|
reciever hdf5 compiling error fixed
|
2018-11-02 14:31:36 +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
|
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
|
014dfaa251
|
moved to vector of unique pointer in slsReceiverImplementation
|
2018-10-16 17:30:43 +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
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +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
|
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 |
|
|
maliakal_d
|
c248b12455
|
refactored ONLY THE CLIENT first stage, compiles
|
2018-10-02 15:15:35 +02:00 |
|
|
maliakal_d
|
e631414526
|
updated version
|
2018-09-27 18:23:08 +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 |
|
|
maliakal_d
|
970d448e73
|
receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5
|
2018-09-26 10:53:45 +02:00 |
|
|
maliakal_d
|
9f84bf7175
|
gui: crashing when using roi fixed
|
2018-09-20 18:10:10 +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
|
d67b4765ea
|
Removing redundant null byte from end of json header
|
2018-09-17 12:32:33 +02:00 |
|
|
maliakal_d
|
14c899e7cf
|
removed some manual warnings
|
2018-08-24 12:34:06 +02:00 |
|
|
maliakal_d
|
588037fd18
|
updated release version
|
2018-08-23 16:23:24 +02:00 |
|
|
maliakal_d
|
4e446f1f39
|
eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server
|
2018-08-17 13:45:09 +02:00 |
|
|
maliakal_d
|
830f92dedc
|
client and receiver: silent mode put into shared memory, works properly now
|
2018-08-15 19:51:04 +02:00 |
|
|
maliakal_d
|
87e8333dfd
|
slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener
|
2018-08-15 19:02:16 +02:00 |
|
|
maliakal_d
|
b3ccd5e1a1
|
slsReceiverSoftware: bugfix double acquire did not write parameter file cuz vector.push_back always never clearing when closing current file
|
2018-08-14 19:11:52 +02:00 |
|
|
maliakal_d
|
f0ac49190a
|
slsReceiver:trying to get deactivate to work
|
2018-08-14 15:06:06 +02:00 |
|
|
maliakal_d
|
0018fa46f8
|
slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit
|
2018-08-10 19:14:05 +02:00 |
|
|
maliakal_d
|
c934e92a41
|
Merge branch 'mainexceptions' into developer
|
2018-08-10 17:10:15 +02:00 |
|
|
maliakal_d
|
da4253fe13
|
Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0
|
2018-08-10 17:07:29 +02:00 |
|
|
Erik Frojdh
|
3cab1bc0fe
|
minor cleaning of ZmqSocket
|
2018-08-10 14:34:59 +02:00 |
|
|
maliakal_d
|
39ebd81230
|
Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception)
|
2018-08-09 18:21:30 +02:00 |
|
|
maliakal_d
|
823c855ef4
|
Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception)
|
2018-08-09 18:19:47 +02:00 |
|
|
maliakal_d
|
a0512a01d5
|
Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do
|
2018-08-09 18:12:56 +02:00 |
|
|
Erik Frojdh
|
bdd37fa7c2
|
commenting zmq detail
|
2018-08-09 17:58:55 +02:00 |
|
|
Erik Frojdh
|
a96a019435
|
string lenght
|
2018-08-09 17:46:07 +02:00 |
|