55 Commits

Author SHA1 Message Date
1a1c6b9b42 jungfrau server: feature finish: switching between 2 interfaces 2019-05-17 19:19:03 +02:00
71dd43d252 connected analog databytes 2019-05-01 12:25:21 +02:00
2f3b0e0b06 ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever 2019-04-30 18:55:32 +02:00
56d1994b8c ctb file frame header back in 2019-04-30 11:18:09 +02:00
61a939ef53 ctb: removed setroi, instead using adcenablemask 2019-04-26 16:53:23 +02:00
f5feb081ab removing header metadata for ctb binary files 2019-04-25 19:20:13 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Erik Frojdh
0ef030354f warning 2019-02-08 14:03:49 +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
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
c366e94a96 bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do 2018-07-05 13:47:20 +02:00
5be2979fff slsReceiver: fix to default number of frames per file, also set to 10k 2018-05-28 11:18:13 +02:00
94ce042401 slsReceiver, fixed virtual hdf5 last row random values bug 2018-05-18 14:51:18 +02:00
1152555663 esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size 2018-05-01 11:55:48 +02:00
Dhanya Maliakal
a89847538d merge ocnflict for white background 2017-11-28 11:29:15 +01:00
Dhanya Maliakal
a351fa8f28 switching from black to white background for receiver 2017-11-28 11:18:30 +01:00
Dhanya Maliakal
114c45c04a making gui work temporarily for jctb 2017-11-22 09:27:42 +01:00
Dhanya Maliakal
3a26c95c0d Merge branch '3.0.1' into developer 2017-11-21 15:46:21 +01:00
Dhanya Maliakal
8c45f94496 updated npixelsy for jungfrau effecting hdf5 mapping 2017-11-21 15:46:10 +01:00
Dhanya Maliakal
3da8bca462 allowing receiver to know of gap pixels enable even in 4 bit mode, but not doing anything useful 2017-10-31 12:39:36 +01:00
Dhanya Maliakal
ce7386e230 merge solved from developer, xcoord from detector if given 2017-10-23 17:21:45 +02:00
Dhanya Maliakal
210bcb081d xcoord should not be hardcoded for this version for eiger and jungfrau 2017-10-20 10:49:02 +02:00
Dhanya Maliakal
2e5f64d9bc gap pixels for 8, 16, 32 in receiver at udp level 2017-10-05 15:59:07 +02:00
Dhanya Maliakal
4669d408d4 somewhere in between 2017-10-03 12:09:31 +02:00
Dhanya Maliakal
7cde5dbe38 changes upto the receiver, not incl gui 2017-10-03 10:44:08 +02:00
Dhanya Maliakal
5ff574b33f made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now 2017-09-12 15:04:56 +02:00
Dhanya Maliakal
5f90db723c increased default fifo depth for gotthard 2017-08-16 17:27:31 +02:00
Dhanya Maliakal
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
Dhanya Maliakal
f4857355b6 fixed new header for eiger 2017-06-28 16:53:01 +02:00
Dhanya Maliakal
e6f1a90ed7 changes 2017-06-27 14:57:43 +02:00
Dhanya Maliakal
68bbea17d1 removed fifo buffer size print out (fifo buffer size removed earlier) 2017-06-19 14:20:17 +02:00
Dhanya Maliakal
3007694b77 bug (from eiger_newheader) with imagesize of fifo different from actual image size 2017-06-16 13:53:27 +02:00
Dhanya Maliakal
a182ca3660 jungfrau end column fixed 2017-05-16 11:18:36 +02:00
Dhanya Maliakal
bd363b2c93 jungfrau finally works with new header 2017-05-15 17:02:37 +02:00
Dhanya Maliakal
205a3780d5 changes for jungfrau new header 2017-05-15 15:00:04 +02:00
Dhanya Maliakal
a1fc93b398 changes including warnings and zmq 2017-05-04 17:52:58 +02:00
Dhanya Maliakal
44339d3b89 c_Str() not access global variables from thread 2017-05-02 08:25:45 +02:00
Dhanya Maliakal
b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
Dhanya Maliakal
1e94ec0c6a fixed short gotthard 2017-03-09 13:28:03 +01:00
Dhanya Maliakal
86018684c9 made it work for gotthard 2017-03-09 11:40:48 +01:00
Dhanya Maliakal
0e4c7a9494 adjusted for jungfrau 2017-03-07 14:59:38 +01:00
Dhanya Maliakal
50f8366bc2 small changes for jungfrau, but also for the gui 2017-03-03 15:57:48 +01:00
Dhanya Maliakal
537260879a created virtual datasets for bunchid and subframenumber 2017-03-02 11:43:11 +01:00
Dhanya Maliakal
a7309be567 created links to virtual files in master file 2017-03-01 08:44:43 +01:00
Dhanya Maliakal
829ba49c1c moving subframenumber into a 32 bit number, also in stremer, changing json header to mention 4 bit and version number 2017-02-28 15:30:53 +01:00
Dhanya Maliakal
3b07afe3fc in the process of streamer 2017-02-27 15:38:46 +01:00
Dhanya Maliakal
936dfea8a7 works so far, no gui yet 2017-02-22 12:01:00 +01:00