Commit Graph

573 Commits

Author SHA1 Message Date
Erik Fröjdh b4c207fc4e Less data race in slsReceiver (#50)
* removed some data races

* non needed mutex

* removed extra include
2019-08-21 12:02:06 +02:00
maliakal_d 422a928be4 ctb rxr: changing to old header (like moench) 2019-08-21 11:13:17 +02:00
maliakal_d 11c1fb0e11 Added roi to master file 2019-08-20 13:42:26 +02:00
maliakal_d 10ce82fc5f WIP 2019-08-16 17:07:30 +02:00
maliakal_d e635ff035c receiver master file includes quad, gap pixels enable, version updated for binary and hdf5, parallel, analog, digital, adc, dbitofset, dbitlist 2019-08-14 21:14:06 +02:00
maliakal_d ba0c6ff286 eiger bug fix: quad gap pixels 2019-08-14 17:49:09 +02:00
maliakal_d d4d8cbe9bc gotthard fixed roi only xmin and xmax.remove updateoffsets 2019-08-14 09:20:50 +02:00
Dhanya Thattil 98ddf154b2 Partialreadout (#47)
* eiger server, rxr: partial readout, also gui messages: up last command, down clear command

* added binaries and resolved conflict

* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3

* brackets in defs
2019-08-07 09:08:58 +02:00
Dhanya Thattil d72b6c3659 eiger server: quad, interrupt subframe, reg left and right (#45)
* eiger server: quad, interrupt subframe, reg left and right

*  eiger server: beb can fail in setting up quad, quad and gap pixels
2019-08-06 10:12:34 +02:00
Dhanya Thattil e7a76ccea1 Quad (#39)
* making quad work in developer branch

* binary added

* minor changes

* bug fix to set quad to 0 when more than 1 detector
2019-07-22 16:41:03 +02:00
Erik Fröjdh 1a9755ad0b New filename structure (#38)
* WIP

* WIP

* linking names

* define for hdf5

* minor

* addressed comments
2019-07-22 15:52:21 +02:00
maliakal_d 8ac7d96ef3 WIP 2019-07-05 08:54:50 +02:00
Erik Frojdh 1fed3553b9 cleaning up tcp 2019-06-07 16:13:34 +02:00
Erik Frojdh 72e0d7e168 clang format on receiver TCP and Implementation 2019-06-06 08:07:40 +02:00
Erik Fröjdh 1db7521cfa exceptions TCP (#31)
* WIP

* first test

* format

* test frames

* also 0:

* WIP

* WIP

* first test

* format

* test frames

* also 0:

* test and less local

* pass ret by value

* level

* WIP

* WIP

* cleaning up interface

* removed ref

* another

* updated api version

* cleanup

* cleanup

* WIP

* fixes

* fixed tests
2019-06-05 15:25:18 +02:00
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
maliakal_d 10f89599e0 bug fix: hdf5 printError still called once. replcaed with printErrorStack 2019-05-22 19:11:35 +02:00
maliakal_d 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
maliakal_d 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
maliakal_d 71dd43d252 connected analog databytes 2019-05-01 12:25:21 +02:00
maliakal_d fc7d3bcaea ctb callback used 2019-05-01 12:10:15 +02:00
maliakal_d 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
maliakal_d b0cffcd570 master file option, adcdisable changed to adcenable 2019-04-30 12:13:28 +02:00
maliakal_d 56d1994b8c ctb file frame header back in 2019-04-30 11:18:09 +02:00
maliakal_d 61a939ef53 ctb: removed setroi, instead using adcenablemask 2019-04-26 16:53:23 +02:00
maliakal_d f5feb081ab removing header metadata for ctb binary files 2019-04-25 19:20:13 +02:00
maliakal_d 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
maliakal_d 708975acb5 receiver bug fix: function pointer not initialized as null in dataprocessor 2019-04-18 09:27:02 +02:00
maliakal_d 89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
maliakal_d ed74e710d6 merge from 4.0.1 2019-02-11 14:37:54 +01:00
maliakal_d 6bf1a944da updaterev 2019-02-08 17:28:44 +01:00
maliakal_d 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
maliakal_d 143682cfb1 updaterev 2019-02-07 16:55:01 +01:00
maliakal_d f810a9e9fb updated rev 2019-01-04 09:13:00 +01:00
bergamaschi dceea92f1a Fixed big problem with CPU readout 2018-12-06 12:58:54 +01:00
bergamaschi d8140d8db9 anna version 2018-12-06 10:55:18 +01:00
maliakal_d 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