35 Commits

Author SHA1 Message Date
b39c64032d clang format 2021-10-19 14:49:43 +02:00
4de7bb51ed updated all .h files with license notice and copyright notice 2021-10-14 18:10:56 +02:00
bb1ad0c905 merge fix 2021-10-07 16:11:19 +02:00
46a8a2461c Removed Padding option for Deactivated half modules. 2021-10-06 15:11:17 +02:00
34fb823675 changing ports only in shared memory and not going to detector/receiver server to change current tcp port 2021-10-06 14:24:57 +02:00
732270f437 renaming sls and detectors to modules, multis to detector 2021-09-15 14:53:31 +02:00
25d03f949e partialread changed to readnrows 2021-08-31 16:46:49 +02:00
62d697e91f readnlines->partialread, better debugging for TCP socket interface bug 2021-08-13 12:34:50 +02:00
619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
fdf6632356 wip 2021-07-05 15:20:34 +02:00
Dhanya Thattil
f9f50f1d84
M3settings (#228)
* added temp m3 settings files

* renames settings noise to trim

* get threshold for M3

* some changes to compile on RH7 and in the server to load the default chip status register at startup

* Updated mythen3DeectorServer_developer executable with correct initialization at startup

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
2021-01-14 12:34:13 +01:00
Erik Frojdh
06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +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
5b182469a1 rxr: fixed all updates from rxParameters, connected them in masterAttributes, added json header and scan parametes in metadata 2020-09-04 13:49:30 +02:00
abe34d573c WIP 2020-09-02 16:15:33 +02:00
Dhanya Thattil
ce25b3018c
Merge pull request #126 from slsdetectorgroup/m3
M3
2020-08-04 15:21:30 +02:00
Erik Frojdh
4174d193b4 removed exec_command from ClientInterface 2020-08-04 10:50:57 +02:00
8631f5e2b0 m3: counter mask in master file 2020-08-03 16:39:31 +02:00
885b22eca8 ratecorrectiosn addded to master file 2020-07-31 18:38:27 +02:00
67bb0dff1a rx_zmqstartfnum, not tested 2020-07-16 12:18:18 +02:00
7cc05ead89 WIP 2020-06-18 12:41:10 +02:00
Dhanya Thattil
f5160b0978
exposing receiver thread ids to client (#102)
* exposing receiver thread ids to client

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-06-09 16:18:37 +02:00
fa768e584e rxr 2020-05-20 10:14:57 +02:00
Erik Frojdh
2c83abcac7 merged detFuncs for c and c++ 2020-05-15 12:24:06 +02:00
Erik Frojdh
e599bb7c24 format receiver 2020-05-05 10:04:52 +02:00
Erik Frojdh
8afa11ed33 removed pointer to server socket 2020-04-20 17:20:33 +02:00
Erik Frojdh
bc389f4825 moved data members to top 2020-04-20 14:51:48 +02:00
38c31fdada WIP 2020-04-08 20:27:10 +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
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver 2020-03-19 07:01:32 +01:00
Erik Frojdh
40bfca588b minor from clang-tidy 2020-02-04 10:36:03 +01:00
Erik Frojdh
ec66079f65 renamed ServerInterface 2020-02-04 08:57:35 +01:00
Erik Frojdh
254e8f85d8 moved non public headers 2020-02-03 14:38:24 +01:00