101 Commits

Author SHA1 Message Date
b37db1de72 ctb and moench: wrong firmware will set numchannels to 0 and this will throw when updating detector size, binaries in 2021-08-20 14:03:43 +02:00
619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
fc7efb2410 refactor 2021-07-29 18:08:41 +02:00
Erik Fröjdh
10b315c2bd
Mythen3 improved synchronization (#231)
Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready
startDetector first starts the slaves then the master
acquire firs calls startDetector for the slaves then acquire on the master
getMaster to read back from hardware which one is master
2021-02-08 13:28:37 +01:00
7fcac35549 gui exception thrown from acquire caught properly in gui 2020-11-17 17:39:34 +01:00
Erik Frojdh
40f6eb8ede WIP 2020-11-17 15:33:09 +01:00
146d605d19 gui callback exception caught 2020-11-17 14:01:53 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
671ee3179e bug fix for gap pixels with multi frames in gui (issue with overwriting original npixelsx and npixelsy with gap values 2020-10-27 16:50:42 +01:00
6c1035aa99 zmq hwm are specified to 2 for gui and restreaming of receiver if all zmq not closed at end of acquiistion 2020-10-08 13:01:01 +02:00
3a3c5b0a6e minor readframefromrxr using unique ptrs 2020-09-29 14:37:43 +02:00
2fc0768ad1 minor warning fix 2020-09-21 17:57:31 +02:00
Dhanya Thattil
b0dd82c667
removing sem_wait in acquire (#182) 2020-09-17 13:55:20 +02:00
Dhanya Thattil
1edb1e8816
GUI: adding 1D detectors by default in x direction, others in y dir (#164) 2020-09-07 13:03:15 +02:00
096b0c424d spaces in percentage printout for python 2020-08-19 12:56:22 +02:00
de69e666a9 progress changed to double 2020-08-14 12:16:35 +02:00
Erik Fröjdh
1177e54602
Remove VLAs (#124)
Removing the use of VLAs in the client and receiver side code. In addition cleaning up sending jsonheader
2020-07-30 18:22:39 +02:00
ff729fb43f WIP 2020-06-30 11:59:35 +02:00
0cc547c2de WIP 2020-06-18 17:40:23 +02:00
b5781e1f9b multisize to numberofdetectors 2020-06-17 09:57:56 +02:00
ab72d342c9 formatting 2020-06-10 17:29:28 +02:00
Erik Frojdh
9c26cd5552 clang-tidy delete nullptr 2020-06-10 08:37:06 +02:00
Erik Frojdh
5f91198328 clang-tidy nullptr 2020-06-10 08:30:12 +02:00
223e24f924 WIP 2020-06-03 14:56:24 +02:00
eea67014b7 gotthard2 with veto data on second interface 2020-05-13 17:50:18 +02:00
9a1fdc4104 Merge branch 'developer' into eiger26 2020-05-12 13:43:36 +02:00
Erik Frojdh
ed8d606eb2 WIP 2020-05-11 19:19:49 +02:00
13c1f7c2d6 WIP 2020-05-08 16:31:26 +02:00
Erik Frojdh
959fd562d3 clang-format 2020-05-04 16:30:00 +02:00
Dhanya Thattil
fdb6e3f3d4 Removeshm (#90)
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not  updated yet)

* removed dr and deadtiem from shm

* help for rx_status and status to point them to rx_Start, rx_stop, start and stop

* moved progress to receiver

* removed currentsettings from eiger shm

* updated server binaries, and client api

* moench and ctb virtual servers compile fix

* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
Dhanya Thattil
d58eb1dc6e
Gappixels (#89)
* WIP

* WIP virtual delays, imagetest for saturation

* WIP, vertical and horizontal

* WIP

* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers

* quad works (also in virtual), handling gappixels and quad

* jungfrau gapppixels work

* jungfrau: done

* complete image or missing packets given in json header and gui

* eiger virtual 4 bit mode bug fix

* working version of zmq add json header, except printout

* printout bug

* fix for json para

* to map WIP

* map done

* map print , mapwith result left

* json result works, testing added

* updated server binaries

* compiling on rhels7, variable size char array iniitalization

* zmqsocket parsing didnt need Document

* const to map, json para is strings not map

* json add header: mapping cleaner without insert make_pair
2020-03-30 14:54:35 +02:00
Erik Frojdh
dee0aea378 replace stoi with StringTo<int> 2020-03-19 12:33:13 +01:00
Erik Frojdh
f940397e3a cleaning 2020-03-11 18:10:37 +01:00
Erik Frojdh
dc53887a48 minor clean 2020-03-11 17:49:32 +01:00
Erik Frojdh
5784ce8231 slsDetector -> Module 2020-03-11 16:16:15 +01:00
Erik Frojdh
4aeb8bf62e introducing new logger 2020-03-11 10:54:55 +01:00
Dhanya Thattil
758afad02c
ctb, moench, eiger, gotthard: get number of channels for moench and ctb, others removed unnecessary variables in shm, added moench virtual sever (#86) 2020-03-10 09:08:08 +01:00
0a596c689b sanitizer on, gui:removed qfuture, client: not implemented made specific as to what is not 2020-03-06 15:41:15 +01:00
dec4d00fbf ctb: gui call back fix 2020-03-05 11:31:36 +01:00
fca7d51cb4 moench: removed hardcoding ny in call back for gui 2020-03-03 16:30:28 +01:00
6bbcf6173d moench: first version 2020-03-02 18:34:10 +01:00
80304c2eaf multi progress calculated in one function rather getting all of them from shm 2020-02-26 11:17:49 +01:00
f4b922165f bugfix from earlier commit: dr in readfromreceiver commented out 2020-02-24 10:36:52 +01:00
fc27cfd663 merging problem 2020-02-18 10:55:41 +01:00
Dhanya Thattil
94fcf52e64
Merge pull request #76 from slsdetectorgroup/exec
Buffern in exec
2020-02-04 10:59:48 +01:00
Erik Frojdh
b9446f40d1 fmt and minor 2020-02-04 10:11:27 +01:00
Erik Frojdh
f42d591845 sizeof 2020-02-03 16:51:57 +01:00
Erik Frojdh
e9029ba8f2 removed unused functions 2020-02-03 16:44:14 +01:00
Erik Frojdh
121747352d buffer 2020-02-03 16:35:30 +01:00
Erik Frojdh
a829e69313 minor 2020-02-03 16:00:24 +01:00