509 Commits

Author SHA1 Message Date
5214c0f1a4 binaries in 2020-09-10 18:43:26 +02:00
88fe306902 binaries in 2020-09-10 16:23:29 +02:00
80b053eb10 binaries resolved, merge conflict from developer 2020-09-10 10:19:34 +02:00
52303daffd binaries in 2020-09-09 16:44:23 +02:00
a9d1a78662 m3:smp_clk (timing rxr) changed back to clk div 5 2020-09-09 15:55:13 +02:00
3cf2160a2d binaries in 2020-09-09 15:25:48 +02:00
82e978e901 WIP 2020-09-09 13:47:54 +02:00
04bf2aca6d Merge branch 'developer' into rmMoenchAPI 2020-09-09 13:45:19 +02:00
b33fdf4462 merge conflict fixed and merged with developer 2020-09-09 12:31:36 +02:00
6c8443f09e binaries in 2020-09-09 12:14:38 +02:00
bdac4d133e conflict solved and merged with developer 2020-09-09 10:27:14 +02:00
Dhanya Thattil
e8156d412e
G2: continuous internal mode (#167) 2020-09-09 10:13:15 +02:00
87bad38f80 binary in 2020-09-08 15:46:32 +02:00
e1e04ee755 binaries in 2020-09-08 15:18:07 +02:00
8e49a114db moench: removed api that goes only to processor (future: one has to use rX_jsonaddheader or rx_jsonpara to set key and values) 2020-09-08 12:34:56 +02:00
8496f5715f binaries in 2020-09-08 11:55:17 +02:00
f26d8e514b merged with g2continuous 2020-09-08 08:46:37 +02:00
0b9ff70244 binaries in 2020-09-08 08:25:24 +02:00
503f83e8e3 Merge branch 'developer' into g2continuous 2020-09-07 17:07:09 +02:00
f280d033b9 binarie sin 2020-09-07 16:44:48 +02:00
b20720686e gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode 2020-09-07 16:13:33 +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
b124cea67b Merge branch 'developer' into rxrmetadata 2020-09-03 17:48:03 +02:00
891b8dbd2c mythen3: wrong hardware version number, so it didnt reboot after programfpga 2020-09-03 17:04:58 +02:00
7bb9696151 Merge branch 'developer' into rxrmetadata 2020-09-02 18:07:22 +02:00
658a804cca gotthard2: change default clock divider of readout clocks 1 and 2 from 8 to 6 2020-09-02 16:48:58 +02:00
abe34d573c WIP 2020-09-02 16:15:33 +02:00
00978a52c8 added smp_clk, changed rdo vco freq from 1.25GHz to 1GHz, changed rdo clock dividers 2020-09-01 12:06:39 +02:00
8400c686b5 binaries in 2020-08-31 18:22:41 +02:00
Dhanya Thattil
4e9c99d65d
Merge branch 'developer' into m3txndelay 2020-08-18 15:58:32 +02:00
Dhanya Thattil
dd918fb326
eiger deactivate beb functions (#140)
eiger: some deactivated beb functions should return a value instead of accessng  beb
2020-08-18 15:52:52 +02:00
7ea86dec43 m3 binaries in 2020-08-18 15:28:30 +02:00
de69e666a9 progress changed to double 2020-08-14 12:16:35 +02:00
0c7759d7e4 formatting 2020-08-11 17:09:36 +02:00
27b2a607c8 binaries in 2020-08-10 12:05:37 +02:00
8e2bd17704 updated client script 2020-08-10 12:04:31 +02:00
d56b2134ef updated client versions 2020-08-10 09:58:57 +02:00
Erik Frojdh
78fdf5b60a removed casts 2020-08-06 12:33:43 +02:00
Erik Frojdh
132043a70d static_assert enum size 2020-08-06 11:50:35 +02:00
Erik Fröjdh
aa0c36713c
Utility function to get a vector of set bits
Template function to return a vector with the positions of all set bits in a variable.
2020-08-05 13:42:57 +02:00
bbf8ab4b88 binary in 2020-08-05 09:49:13 +02:00
321ed13659 merge from developer 2020-08-04 17:43:38 +02:00
bb3951c201 binaries in 2020-08-04 16:57:06 +02:00
380b062216 configure mac 2020-08-04 16:55:31 +02:00
Erik Frojdh
a70d4e1e5d Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-04 15:38:45 +02:00
Erik Frojdh
3301a80d99 send string 2020-08-04 15:38:38 +02:00
d25f9093d5 binary in 2020-08-04 12:02:37 +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
4702a76235 Merge branch 'developer' into eiger 2020-07-31 17:15:07 +02:00