detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity
4,945 Commits 45 Branches 100 Tags
Commit Graph

195 Commits

Author SHA1 Message Date
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
Dhanya Thattil
afb6d6bf3a WIP 2019-06-12 10:40:56 +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
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
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
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
Dhanya Thattil
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
Erik Frojdh
8ebc0f2644 uniqe ptr for receiver 2019-05-27 11:28:59 +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
Dhanya Thattil
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
Dhanya Thattil
fc7d3bcaea ctb callback used 2019-05-01 12:10:15 +02:00
Dhanya Thattil
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
Dhanya Thattil
b0cffcd570 master file option, adcdisable changed to adcenable 2019-04-30 12:13:28 +02:00
Dhanya Thattil
61a939ef53 ctb: removed setroi, instead using adcenablemask 2019-04-26 16:53:23 +02:00
Dhanya Thattil
8256b7ba84 eiger receiver fix: setting eth2 as well for eiger 2019-04-18 11:16:02 +02:00
Dhanya Thattil
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Anna Bergamaschi
817736fcd5 after merging with developer 2018-11-02 10:48:06 +01:00
Dhanya Thattil
9f84bf7175 gui: crashing when using roi fixed 2018-09-20 18:10:10 +02:00
Dhanya Thattil
c784f0f539 client: moved shortenable to roi in reciever, roi not yet written in master file 2018-09-19 17:35:26 +02:00
Anna Bergamaschi
f288390255 Zmq communication uses additional headers, moench processing fixed 2018-09-11 17:05:11 +02:00
Dhanya Thattil
4e446f1f39 eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server 2018-08-17 13:45:09 +02:00
Dhanya Thattil
830f92dedc client and receiver: silent mode put into shared memory, works properly now 2018-08-15 19:51:04 +02:00
Dhanya Thattil
f0ac49190a slsReceiver:trying to get deactivate to work 2018-08-14 15:06:06 +02:00
Dhanya Thattil
1102153d2b Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically) 2018-08-09 15:43:56 +02:00
Dhanya Thattil
05055eb283 slsReceiver: deleting slsReceiverUsers object before calling start() gives seg fault 2018-08-03 09:32:31 +02:00
Dhanya Thattil
40c96b5562 Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings 2018-07-18 12:29:19 +02:00
Dhanya Thattil
c366e94a96 bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do 2018-07-05 13:47:20 +02:00
Dhanya Thattil
cf8b0de433 slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up 2018-05-28 19:11:34 +02:00