Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… ( #27 )
...
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit
* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00
Erik Frojdh
daa82b91a9
removed comment
2019-05-28 14:44:46 +02:00
Erik Frojdh
8ebc0f2644
uniqe ptr for receiver
2019-05-27 11:28:59 +02:00
Erik Frojdh
0972b803dd
Merge branch 'developer' into mysocket
2019-05-27 09:12:10 +02:00
10f89599e0
bug fix: hdf5 printError still called once. replcaed with printErrorStack
2019-05-22 19:11:35 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
Erik Frojdh
c30c6bb883
fixed uninitialized pointer
2019-05-16 15:00:15 +02:00
Erik Frojdh
1db1b0307c
init
2019-05-16 11:50:35 +02:00
Erik Frojdh
0d98bd0048
init
2019-05-16 11:43:12 +02:00
Erik Frojdh
c6651df1b2
remove mySock
2019-05-16 11:14:03 +02:00
Erik Frojdh
e252b8e0e9
receiver socket
2019-05-15 17:51:48 +02:00
Erik Frojdh
40c2d9f760
try for accept
2019-05-15 12:17:32 +02:00
Erik Frojdh
9d5848d0d6
inprogress
2019-05-15 09:12:14 +02:00
Erik Frojdh
ab5aa78b8a
clang-tidy modernize
2019-05-14 16:53:50 +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
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
ff4ce48e5d
receiver memory alignment: all data and header is a multiple of 64 bit, just the fifo header size needed to be 8
2019-04-18 11:35:08 +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
6bf1a944da
updaterev
2019-02-08 17:28:44 +01:00
3c77447868
removed minor warnings
2019-02-08 16:32:23 +01:00
Erik Frojdh
0ef030354f
warning
2019-02-08 14:03:49 +01:00
Erik Frojdh
cd738106ec
printf and uninitialized variables
2019-02-08 11:14:16 +01:00
143682cfb1
updaterev
2019-02-07 16:55:01 +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
817736fcd5
after merging with developer
2018-11-02 10:48:06 +01:00
e631414526
updated version
2018-09-27 18:23:08 +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
