5242 Commits

Author SHA1 Message Date
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
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
221bb65c0e gotthard2: bfin instead of nios (not using registers yet) 2019-09-02 13:11:07 +02:00
02634abbbc gotthard2:virtual server fix, server recompile 2019-09-02 13:05:28 +02:00
bd95126da2 gotthard2:hv 2019-09-02 12:57:24 +02:00
4a112104ad gotthard2, removed .gdb, removed warnings 2019-08-30 18:08:16 +02:00
9bc6c44e51 hv for strip 2019-08-30 17:53:04 +02:00
8c15b52b87 nios 2019-08-30 17:28:18 +02:00
9e7a133422 gotthard2: nios server 2019-08-30 16:44:11 +02:00
cb8c7eea54 updated binaries 2019-08-30 11:26:23 +02:00
Dhanya Thattil
0d35b966ff
Separate headers (#57)
* WIP, ctb

* WIP, eiger

* WIP, gotthard

* WIP, jungfrau

* WIP, gotthard2

* WIP, mythen3

* WIP, moench

* fixed gotthard apiversioning mismatch with gotthard2
2019-08-30 11:17:37 +02:00
49d47e633d gui: adc invert at any time 2019-08-29 11:52:03 +02:00
Dhanya Thattil
e23b3b0471
Ctbgui det (#58)
* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* defs added

* ctb gui: tengiga bug fix

* WIP

* WIP
2019-08-29 11:39:29 +02:00
Dhanya Thattil
4f0634fe62
adc invert for highz (#59) 2019-08-29 10:12:10 +02:00
Erik Frojdh
1980a7d80c python fix 2019-08-28 14:19:54 +02:00
014b8cf9a6 fixed problem with dbitpipeline in ctb gui 2019-08-28 12:05:45 +02:00
f123a280bb added save pattern, printout of some of the pattern for command line 2019-08-27 16:41:38 +02:00
7abb18e5c8 added load paramaters to detector.h 2019-08-27 11:24:53 +02:00
fc0b25cfa7 gui bug fix: hostname print out and acquisition index 2019-08-27 09:25:10 +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
Marie Andrä
7a4c1161ab add default period for mythen3 (#56) 2019-08-26 12:03:20 +02:00
94013a7fad delay not implemented for mythen3 and gotthad2 2019-08-26 11:58:34 +02:00
aecf3bb7db gotthard udp fix 2019-08-26 11:47:28 +02:00
3497175b15 merge resovled 2019-08-26 10:55:44 +02:00
298e1dd1fe udp virtual of gotthard2 2019-08-26 10:54:01 +02:00