1346 Commits

Author SHA1 Message Date
f0ba8a06ce ctb 10g fix for old reciever 2019-08-21 13:21:35 +02:00
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
422a928be4 ctb rxr: changing to old header (like moench) 2019-08-21 11:13:17 +02:00
11c1fb0e11 Added roi to master file 2019-08-20 13:42:26 +02:00
ea5ac6ad03 WIP 2019-08-20 13:20:25 +02:00
7457c56533 slsmultireceiver copied to slsreceiver/src cmake 2019-08-19 09:08:10 +02:00
10ce82fc5f WIP 2019-08-16 17:07:30 +02:00
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
ba0c6ff286 eiger bug fix: quad gap pixels 2019-08-14 17:49:09 +02:00
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
8ac7d96ef3 WIP 2019-07-05 08:54:50 +02:00
864db79a13 WIP 2019-07-02 17:11:03 +02:00
Erik Frojdh
547ab8a749 Merge branch 'developer' into gui 2019-07-02 10:54:29 +02:00
Erik Fröjdh
d3101baacb receiver create path (#35) 2019-06-25 11:14:04 +02:00
afb6d6bf3a WIP 2019-06-12 10:40:56 +02:00
3c1df02414 merge resolved 2019-06-11 15:56:13 +02:00
Erik Frojdh
1fed3553b9 cleaning up tcp 2019-06-07 16:13:34 +02:00
Erik Frojdh
c86a1e7d48 WIP 2019-06-06 17:00:05 +02:00
Erik Frojdh
72e0d7e168 clang format on receiver TCP and Implementation 2019-06-06 08:07:40 +02:00
e4546c6121 WIP 2019-06-05 17:54:56 +02:00
Erik Frojdh
8cf94537c8 minor 2019-06-05 15:29:12 +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
Dhanya Thattil
894cc1c9e0
Simulator (#28)
* WIP

* wip

* wip

* removed loop

* sending 1 frame

* send multiple frames

* c11 for server

* WIP

* WIP

* Add CMake for the simulators. Requires some refactoring to make slsDetectorServer a proper library.

* Working cmake for jungfrau

* Working cmake for eiger

* WIP

* WIP

* Add preliminary working eiger simulator and breaks the jungfrau simulator

* virtual servers connected

* changes to make it work for rhel7 and install binaries in bin

* removed some unnecessary prints

* removed binaries and virtual makefiles
2019-06-03 10:16:54 +02:00
Erik Frojdh
aa2bcfa308 fixed setup udp 2019-05-28 17:07:34 +02:00
Erik Frojdh
7a9dbd8b76 WIP 2019-05-28 15:43:20 +02:00
Erik Frojdh
daa82b91a9 removed comment 2019-05-28 14:44:46 +02:00
Erik Frojdh
8f4009bfb6 WIP 2019-05-28 13:27:43 +02:00
Erik Frojdh
e64f57ecac receiver 2019-05-28 13:12:43 +02:00
Erik Frojdh
6a81e779c1 replaced server with receiver bug 2019-05-28 11:35:41 +02:00
a0f697ce71 jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top 2019-05-28 10:31:36 +02:00
Erik Frojdh
e4367c9ab1 checking for nullptr 2019-05-27 14:20:40 +02:00
7fdab08256 ctb receiver fix: extract in 8 bit batches instead of 32 for less padding 2019-05-27 11:30:54 +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
615d1b1f33 refactor 2019-05-16 14:27:16 +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
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