80 Commits

Author SHA1 Message Date
398f3734ec rxr: missing packets, stopacquistion lets rxr know to calculate missing packets from last frame caught 2019-11-20 16:16:14 +01:00
6a27207875 gotthard2: vetoref, burstmode 2019-11-15 18:59:27 +01:00
5518531620 gotthard2: veto reference 2019-11-14 19:01:10 +01:00
28a5aa8342 injectchannel WIP 2019-11-13 15:11:11 +01:00
d7e2ab8ec4 gotthard2: on chip dacs 2019-11-08 17:09:57 +01:00
18b8720c17 separated parameters and versions 2019-11-06 16:43:59 +01:00
1f64d2a4e2 speed separated 2019-11-05 18:50:35 +01:00
031241ae28 timer split up 2019-11-04 16:40:11 +01:00
ba9a0c7917 removed unused multi functions 2019-10-30 18:20:16 +01:00
4b2cb7ecc1 WIP 2019-10-29 11:35:25 +01:00
f4a0780b51 patloops done 2019-10-24 18:59:23 +02:00
Dhanya Thattil
995f0924e5
Commandline (#66)
* WIP

* WIP

* removed status to string from defs

* WIP

* WIP

* WIP removed unused functions in multi

* WIP

* print hex in a terrible way

* WIP, loadconfig error

* WIP, type to string

* WIP

* fix to conversion

* WIP, hostname doesnt work

* WIP

* WIP

* WIP

* WIP, threshold

* WIP, threshold

* WIP

* WIP, triggers

* WIP, cycles to triggers

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* rx_udsocksize fx, WIP

* WIP

* WIP

* WIP

* file index (64 bit), WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* merge

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* New python mod
2019-10-21 10:29:06 +02:00
be50344b45 set clock divider, phase and get clock freq for gotthard2, priliminary 2019-10-17 16:39:41 +02:00
Dhanya Thattil
ca054626e6
Removeudpcache (#65)
* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* solved eiger 1-10g issue

* some fixes for remove udp cache to work

* bug fix virtual

* removed special handling of rx_udpip
2019-09-30 14:46:25 +02:00
Dhanya Thattil
5bcde789ac
Readoutflags (#61)
* WIP

* eiger binary back wih versioning

* fixed readout flag in ctbgui, added speedLevel enum

* ctbgui: fixed a print out error

* ctb readout bug fix

* WIP

* WIP

* WIP
2019-09-02 19:27:27 +02:00
Dhanya Thattil
aafe049a9b
Guidetector (#54)
* WIP

* dacWidget

* main WIP

* advanced WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* works

* updated gui to chrono

* review fixes

* unitque ptrs in gui
2019-08-26 19:14:22 +02:00
62c4bfab64 WIP 2019-08-21 09:23:32 +02:00
28963e313b removed gotthard functions not used 2019-08-20 18:18:34 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
10ce82fc5f WIP 2019-08-16 17:07:30 +02:00
947252c852 WIP 2019-08-16 09:45:49 +02:00
d4d8cbe9bc gotthard fixed roi only xmin and xmax.remove updateoffsets 2019-08-14 09:20:50 +02:00
25eccdffab WIP 2019-08-12 18:57:53 +02:00
4a97dd0eba WIP 2019-08-09 16:16:15 +02:00
5a483eaf29 WIP, new eiger serveR 2019-08-09 11:11:29 +02:00
ca2c284017 WIP 2019-08-08 16:55:37 +02:00
eaf0d8668b WIP 2019-08-08 16:39:25 +02:00
a77964e1dd WIP 2019-08-08 16:18:04 +02:00
ddfb66e999 not compiling 2019-08-08 15:58:00 +02:00
d79447ed3a WIP 2019-08-08 15:50:56 +02:00
8740e4f683 WIP 2019-08-08 14:49:13 +02:00
Dhanya Thattil
4ceee97c03
Api (#48)
* WIP

* WIP

* WIP

* cleaned up multi

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* split up python module

* WIP

* WIP

* WIP

* WIP

* WIP

* ok

* fixed bugs from rebase

* WIP

* fixed broken test

* WIP

* fixed python

* WIP

* sphinx help

* including new commands

* docs

* WIP

* WIP

* more tests

* added missing public header

* WIP
2019-08-07 11:21:07 +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
Erik Fröjdh
e20b5e6952 added const overloads for sendToDetector and sendToReceiver (#46) 2019-08-06 16:58:22 +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
64a8dd2def Stoppedflag (#44)
* removed stopped flag from multi and sls shm, since its removed from fixed pattern in sls, slsshmversion api also added to get hostname and type

* clang format
2019-07-29 11:35:21 +02:00
Dhanya Thattil
b524e0c95f
removed online flags, apiversion in shm, ret for ok and fail, bind socket help in exception message (#43)
* removed online flag, removed rxronline flag, added useReceier flag that is set only when rxr hostname is set, removed setonline, setreceiveronline flag, removed ret for ok or fail, using exceptions for this, changed cannot bind socket printout

* fixed python
2019-07-26 16:33:39 +02:00
Erik Frojdh
9cc1ff43a9 removed non const getFileIndex 2019-07-24 09:05:04 +02:00
Erik Fröjdh
2c453fc1be Removed multiSlsDetector dependency from slsDetector (#41)
* WIP

* removed multiSlsDetector dependency from slsDetector

* removed comment

* review changes
2019-07-23 15:47:39 +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
3c1df02414 merge resolved 2019-06-11 15:56:13 +02:00
Erik Frojdh
170aca0e1f zmqip now uint 2019-06-06 18:17:04 +02:00
bb760f3210 WIP datatoutput 2019-06-06 15:04:05 +02:00
ffbc0a0fc3 Merge branch 'developer' into gui 2019-06-04 12:18:20 +02:00
b74ce95b24 removed colon in commands. affects dac, adc and extsig 2019-06-04 12:10:26 +02:00
e7c164fb24 Merge branch 'developer' into gui 2019-06-03 11:13:03 +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 Fröjdh
877bdb8979 Using FixedCapacityContainer for rxDbitList (#22)
* fixed capacity container

* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967 removed ClientInterface 2019-05-15 08:38:49 +02:00
Erik Frojdh
7314c52c63 removed unneccecary includes 2019-05-14 17:32:21 +02:00