5269 Commits

Author SHA1 Message Date
Dhanya Thattil
0a3905802f
removed dacs not required for mythen3 2019-10-09 16:59:34 +02:00
Dhanya Thattil
833c07707f
gotthard2 dac commands removed in merge, added back 2019-10-09 16:56:34 +02:00
Marie Andrä
9b4fc02b0e start/stop statemachine for my3 (#68)
* start/stop statemachine for my3

* runStatus, readFrame, runBusy (use CONTROL_REG) for mythen3

* registers for Pavel

* change dac names Mythen3
2019-10-09 13:52:07 +02:00
b109ea8d7d jungfrau vref_prech, dac enum similar to mainenum 2019-10-08 18:00:22 +02:00
29a7e227a3 merge 2019-10-08 17:17:44 +02:00
cfd3680176 gotthard2 dacs 2019-10-08 17:10:36 +02:00
Erik Frojdh
87aa5099f2 eiger python 2019-10-08 12:15:57 +02:00
030cfacc9b WIP 2019-10-08 10:57:07 +02:00
Erik Frojdh
b318f8126d more python funcs 2019-10-07 17:24:28 +02:00
Marie Andrä
17295bf662
Update slsDetectorCommand.cpp
complete description of the Mythen3 DACs
2019-10-07 14:39:52 +02:00
Erik Frojdh
58cadefa61 fixed enum 2019-10-07 14:30:16 +02:00
Erik Frojdh
e0d10d0e01 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-10-07 14:18:06 +02:00
Erik Frojdh
6964326c7f python 2019-10-07 14:17:54 +02:00
Marie Andrä
6cda61a612
Update slsDetectorCommand.cpp
help comments for the mythen3 dacs (not complete yet)
2019-10-07 13:44:41 +02:00
7a66dd08a3 help for dacs mythen3 2019-10-07 12:30:28 +02:00
Marie Andrä
5f94b5c246 Dac (#67)
* dac WIP

* dacs WIP

* DACs are working with names

* namechanges of vrfsh->vshaper, vrfshnpol->vshaperneg

* pattern for MY3, configure MAC for MY3
2019-10-07 12:13:25 +02:00
Erik Frojdh
16f7b42533 python 2019-10-07 10:23:40 +02:00
Erik Frojdh
1b06edac9b FixedCapacityContainer fix for clang 2019-10-04 16:54:53 +02:00
d597636c1e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-10-01 17:35:03 +02:00
0f99dd141e gotthard 2 server test bus 2019-10-01 17:34:52 +02:00
Erik Frojdh
da630a8e05 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-10-01 17:29:47 +02:00
Erik Frojdh
cfb017f66a fixed order 2019-10-01 17:29:36 +02:00
b3ff825ce8 updated gotthard2 api etc 2019-10-01 16:26:42 +02:00
Erik Frojdh
c6fd13e49c removed default case 2019-10-01 14:54:57 +02:00
Erik Frojdh
e6472da5f1 error on missing return type 2019-10-01 14:35:25 +02:00
Erik Frojdh
5de5884341 pass by reference 2019-10-01 14:31:00 +02:00
Erik Frojdh
b4f3c0586f string to detector type 2019-10-01 13:56:35 +02:00
Erik Frojdh
aaade64e0b ToString of runStatus 2019-10-01 12:34:03 +02:00
Erik Frojdh
ffa9bbe8d2 fix for string to string conversion 2019-10-01 12:18:06 +02:00
Erik Frojdh
3c6d7ca4a5 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-09-30 15:00:11 +02:00
Erik Frojdh
7242a6901a python compiles 2019-09-30 15:00:03 +02:00
2a40c7f48e recompiled all servers 2019-09-30 14:54:31 +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
Marie Andrä
6e6fcec698 MY3.0:read and write Registers, frames, cycles, delay (#64)
* MY3.0:read and write Registers, frames, cycles, delay

* write pattern seems to work

* done all corrections. added default clks: run_clk=125MHz, tick_clk=20MHz (fix), sampling_clk=80MHz (from Carlos)

* clk check for aquistition time

* clk check for aquistition time

* Update slsDetectorServer_defs.h

* Update slsDetectorFunctionList.c
2019-09-30 14:36:33 +02:00
3d52a2f169 minor chnages 2019-09-27 16:39:46 +02:00
8a4a6c7004 hvdac location change 2019-09-27 16:17:01 +02:00
288b59d292 gotthard2 changes for first firmware version 2019-09-26 14:10:11 +02:00
296518819e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-09-25 12:14:41 +02:00
2a48f70320 Fixed all warning in moenchZmqProcess 2019-09-25 12:14:15 +02:00
Erik Frojdh
07f71d3886 more funcs 2019-09-20 17:46:52 +02:00
Erik Frojdh
dde24559f3 python bindings 2019-09-20 17:01:37 +02:00
Erik Frojdh
b591a42ae7 add 2019-09-20 15:33:07 +02:00
Erik Frojdh
032b4117dd auto generate py enums 2019-09-20 15:28:14 +02:00
Erik Frojdh
af9c67539f more tests 2019-09-20 10:46:28 +02:00
Erik Frojdh
27d223d199 testing 2019-09-19 12:12:25 +02:00
26bc737445 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-09-18 13:22:00 +02:00
61c495f218 multithreading fixed for gain map, common mode and ghosting 2019-09-18 13:21:47 +02:00
Erik Frojdh
c3c3f78c59 removed roflags from python 2019-09-17 09:32:22 +02:00
400e69cef2 Added define for high z cluster finder and fixed gainmap (t.b.t.) 2019-09-10 16:34:29 +02:00
Dhanya Thattil
1cf5033c99
depreciated flags to romode, not readout 2019-09-03 12:53:22 +02:00