925 Commits

Author SHA1 Message Date
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
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
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
67eef8ba75 fix for hdf5 compilation with new cmake 2019-04-24 18:09:53 +02:00