Samuel Debionne
|
e13ecc8625
|
Add slsReceiver and slsDetector targets to the export set (used by donwstream project)
set TARGETS_EXPORT_NAME if the project is built directly.
|
2019-02-05 11:51:03 +01:00 |
|
|
|
fd68a41918
|
udp socket creation error, udpsocket assigned only after. unique ptr later
|
2019-01-16 19:46:08 +01:00 |
|
Erik Frojdh
|
9e5ec6a57b
|
only destroy sem if it was initialized
|
2019-01-16 11:54:01 +01:00 |
|
Erik Frojdh
|
d45375947f
|
only destroy sem if it was initialized
|
2019-01-16 11:53:16 +01:00 |
|
Erik Frojdh
|
73ae8c6151
|
removing static libs
|
2019-01-15 17:24:20 +01:00 |
|
|
|
f810a9e9fb
|
updated rev
|
2019-01-04 09:13:00 +01:00 |
|
|
|
dceea92f1a
|
Fixed big problem with CPU readout
|
2018-12-06 12:58:54 +01:00 |
|
|
|
d8140d8db9
|
anna version
|
2018-12-06 10:55:18 +01:00 |
|
|
|
3a51d107bd
|
gotthard server bug fix: switching between roi and no roi has complex fnum reengineering as fnum and pnum doesnt exist for gotthard, sol at the moment: send an image when configuremac, identify first packet if first two channels is 0xcacacaca, ifthe fnum is odd, then increment. Looking at this only at first image in an acquisition, also reduces roi time by configuring mac only when setting roi, not when getting
|
2018-12-04 12:09:46 +01:00 |
|
|
|
6b4a9be870
|
in between
|
2018-12-04 10:45:55 +01:00 |
|
|
|
b4b38cb607
|
bugfix for gotthard roi and noroi frame number, temporary fix to look at CACACACA to know if its a second packet, and first time look at last bit to know wheter to increment or not for consecutive frames fr no roi
|
2018-12-03 16:25:24 +01:00 |
|
|
|
05d8ef6277
|
bug fix for starting and stopping receiver, without listening
|
2018-12-03 10:45:46 +01:00 |
|
|
|
228cfa35c0
|
receiver bug fix: padding was set only if deactivated, frame padding enabled and deactivated padding enabled. Fixed that frame padding and deactivated padding is independent. Padding is done if frame padding enabled or if deactivated and deactivated padding enabled
|
2018-11-30 16:10:13 +01:00 |
|
|
|
817736fcd5
|
after merging with developer
|
2018-11-02 10:48:06 +01:00 |
|
|
|
e631414526
|
updated version
|
2018-09-27 18:23:08 +02:00 |
|
|
|
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 |
|
|
|
c2db073d5e
|
receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved
|
2018-09-26 15:03:04 +02:00 |
|
|
|
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 |
|
|
|
9f84bf7175
|
gui: crashing when using roi fixed
|
2018-09-20 18:10:10 +02:00 |
|
|
|
c784f0f539
|
client: moved shortenable to roi in reciever, roi not yet written in master file
|
2018-09-19 17:35:26 +02:00 |
|
|
|
d67b4765ea
|
Removing redundant null byte from end of json header
|
2018-09-17 12:32:33 +02:00 |
|
|
|
f288390255
|
Zmq communication uses additional headers, moench processing fixed
|
2018-09-11 17:05:11 +02:00 |
|
|
|
14c899e7cf
|
removed some manual warnings
|
2018-08-24 12:34:06 +02:00 |
|
|
|
588037fd18
|
updated release version
|
2018-08-23 16:23:24 +02:00 |
|
|
|
4e446f1f39
|
eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server
|
2018-08-17 13:45:09 +02:00 |
|
|
|
830f92dedc
|
client and receiver: silent mode put into shared memory, works properly now
|
2018-08-15 19:51:04 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f0ac49190a
|
slsReceiver:trying to get deactivate to work
|
2018-08-14 15:06:06 +02:00 |
|
|
|
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 |
|
|
|
c934e92a41
|
Merge branch 'mainexceptions' into developer
|
2018-08-10 17:10:15 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Erik Frojdh
|
dd3f4aa81d
|
switched from zmq_msg_revc to zmq_recv
|
2018-08-09 17:40:04 +02:00 |
|
|
|
1102153d2b
|
Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically)
|
2018-08-09 15:43:56 +02:00 |
|
|
|
ab7e63c20f
|
Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences
|
2018-08-08 15:43:29 +02:00 |
|
|
|
e77cdb35dd
|
socket: refactored genericsocket a bit to make socketdescriptor readable
|
2018-08-08 14:47:07 +02:00 |
|
|
|
05055eb283
|
slsReceiver: deleting slsReceiverUsers object before calling start() gives seg fault
|
2018-08-03 09:32:31 +02:00 |
|
|
|
73fcef5f6d
|
slsReceiverSoftware: bitset storage in case the libarary changes contiguous representation, also changed hdf5 representation from 512 byte (to_string) to just passing char* to keep at 64 bytes
|
2018-07-30 12:05:22 +02:00 |
|
|
|
3b6ead7783
|
slsReceiver: HDF5: unlimited max dimension in x (#numImages), x dim gets incremented by #frames when it gets an extra image, removed virtual_ naming in parameter names, small cased parameter names
|
2018-07-18 14:05:31 +02:00 |
|
|
|
40c96b5562
|
Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings
|
2018-07-18 12:29:19 +02:00 |
|
|
|
6bb7195a2c
|
slsReceiver: master file limited by size of 1000 bytes
|
2018-07-17 15:41:43 +02:00 |
|
|
|
f5a86bbfe1
|
slsReceiverSoftware: removed hdf5 static cpp file
|
2018-07-10 12:31:55 +02:00 |
|
|
|
45de361b22
|
slsReceiver: added an executable slsMultiReceiver to have the option to have one process create multiple child processes for multiple receivers with configurable tcp port and callback enable
|
2018-07-06 16:26:29 +02:00 |
|
|
|
7c29327b47
|
saving bit field in hdf5 as string of 512 bytes instead of 512 bits for the time being, will be updated when a better option is figured out
|
2018-07-06 12:00:35 +02:00 |
|
