191 Commits

Author SHA1 Message Date
b61ca18967 unrequired enum 2019-11-05 18:57:05 +01:00
567e821569 updated ieger server 2019-11-05 18:52:51 +01:00
1f64d2a4e2 speed separated 2019-11-05 18:50:35 +01:00
Erik Frojdh
2f2e4da628 Moved CmdLineProxy 2019-11-05 11:07:07 +01:00
031241ae28 timer split up 2019-11-04 16:40:11 +01:00
6c5c4f00b3 mythen3 calc checksum 2019-10-31 12:31:51 +01:00
ba9a0c7917 removed unused multi functions 2019-10-30 18:20:16 +01:00
11ea071543 adcinvert for jungfrau, gui for jungfrau dacs 2019-10-30 12:28:51 +01:00
82570bc084 daclist and dacvalues 2019-10-30 11:09:34 +01:00
fe467cdf70 jungfrau dacs named 2019-10-29 18:11:16 +01:00
4b2cb7ecc1 WIP 2019-10-29 11:35:25 +01:00
badff47663 WIP 2019-10-29 11:05:20 +01:00
aa8610fb04 WIP 2019-10-29 10:11:36 +01:00
798f221764 WIP 2019-10-29 10:07:07 +01:00
19b85b8e40 WIP 2019-10-28 11:56:15 +01:00
f4a0780b51 patloops done 2019-10-24 18:59:23 +02:00
f73a15e786 tests made to pass ctb 2019-10-24 11:32:58 +02:00
fa84d17a19 gotthard tests passed 2019-10-22 17:07:38 +02:00
8c6da7da1b jungfrau storage cell bug fix 2019-10-22 13:38:17 +02:00
f2fc187f13 better testing for eiger 2019-10-21 15:10:31 +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
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
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
1b06edac9b FixedCapacityContainer fix for clang 2019-10-04 16:54:53 +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
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
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
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
Erik Frojdh
032b4117dd auto generate py enums 2019-09-20 15:28:14 +02:00
21ce0055b2 gotthard2: soft limit to list 2019-09-03 09:41:54 +02:00
Marie Andrä
4b987abf41 Niosmarie (#63)
* HV for Mythen3 server

* HV for mythen3 server

* corrected upstreams

* missing endif
2019-09-03 09:36:02 +02:00
40b62ef5a4 recompiled binaries 2019-09-02 19:31:36 +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
bd95126da2 gotthard2:hv 2019-09-02 12:57:24 +02:00
9e7a133422 gotthard2: nios server 2019-08-30 16:44:11 +02:00