636 Commits

Author SHA1 Message Date
Erik Frojdh
40c2d9f760 try for accept 2019-05-15 12:17:32 +02:00
Erik Frojdh
8f8d565e4e work 2019-05-15 10:09:54 +02:00
Erik Frojdh
f64facee0c Merge branch 'developer' into mysocket 2019-05-15 10:02:43 +02:00
Erik Fröjdh
877bdb8979 Using FixedCapacityContainer for rxDbitList (#22)
* fixed capacity container

* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
9d5848d0d6 inprogress 2019-05-15 09:12:14 +02:00
Erik Frojdh
24fc5de58d clang-tidy header include order 2019-05-14 17:34:51 +02:00
Erik Frojdh
97692ae3ab moved from c headers 2019-05-14 17:17:21 +02:00
Erik Frojdh
74d67261a9 no check for null when deleting 2019-05-14 17:09:24 +02:00
Erik Frojdh
29be6f3b34 no check for null when deleting 2019-05-14 17:07:56 +02:00
Erik Frojdh
81e858ea4d clang-tidy implicit bool 2019-05-14 17:05:27 +02:00
Erik Frojdh
ab5aa78b8a clang-tidy modernize 2019-05-14 16:53:50 +02:00
3e654977ca slsReceiver bug fix in ctb extracting digital bits 2019-05-14 16:41:25 +02:00
d114f8db90 receiver bug fix: ctb extractng bits source pointer bug 2019-05-14 11:43:45 +02:00
e14519c236 slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests 2019-05-03 20:37:40 +02:00
7683b18fa3 ensuring only analog is not in callback 2019-05-01 20:18:46 +02:00
71dd43d252 connected analog databytes 2019-05-01 12:25:21 +02:00
fc7d3bcaea ctb callback used 2019-05-01 12:10:15 +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
b0cffcd570 master file option, adcdisable changed to adcenable 2019-04-30 12:13:28 +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
18558e1288 bug fix command line patnloops should print in decimal, receiver ctb: added p option to print data for debugging, fixed initializing of result in memory 2019-04-25 17:39:46 +02:00
91a338cf52 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-24 16:17:07 +02:00
9b53a295e1 my302 receiver modified to be debugged later 2019-04-24 16:16:56 +02:00
Erik Frojdh
8cc8b58b05 sendToDetector 2019-04-24 15:24:56 +02:00
eb88fabfbc receiver callback rearranging data for mythen302 2019-04-24 13:32:21 +02:00
262140728f receiver callback rearranging data for mythen302 2019-04-24 13:30:57 +02:00
8256b7ba84 eiger receiver fix: setting eth2 as well for eiger 2019-04-18 11:16:02 +02:00
708975acb5 receiver bug fix: function pointer not initialized as null in dataprocessor 2019-04-18 09:27:02 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
ed74e710d6 merge from 4.0.1 2019-02-11 14:37:54 +01:00
Erik Frojdh
cd738106ec printf and uninitialized variables 2019-02-08 11:14:16 +01:00
dcad6c80ce minor modifications for interpolation and mythe data structure 2019-02-06 16:22:17 +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
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
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
f288390255 Zmq communication uses additional headers, moench processing fixed 2018-09-11 17:05:11 +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