 Dhanya Thattil
|
2fcb41426a
|
Merge pull request #82 from slsdetectorgroup/moenchUpdated
Moench updated
|
2020-03-04 10:22:09 +01:00 |
|
 maliakal_d
|
5430288ce8
|
merge fix
|
2020-03-03 17:57:55 +01:00 |
|
|
Dhanya Thattil
|
a61c5e0206
|
Merge pull request #81 from slsdetectorgroup/readme
Updated readme
|
2020-03-03 17:56:05 +01:00 |
|
|
Dhanya Thattil
|
582a3c6878
|
Update README.md
|
2020-03-03 17:55:16 +01:00 |
|
|
maliakal_d
|
134611c638
|
gotthard2: switching between period and burst period (not delay and burst period), internal frequency depending on timing source (for all except actualtime and measurement time)
|
2020-03-03 17:49:28 +01:00 |
|
|
maliakal_d
|
06bd6dfd53
|
Merge branch 'developer' into moenchUpdated
|
2020-03-03 16:37:31 +01:00 |
|
|
maliakal_d
|
fca7d51cb4
|
moench: removed hardcoding ny in call back for gui
|
2020-03-03 16:30:28 +01:00 |
|
|
maliakal_d
|
85aca0ffad
|
moench: insignficant dac naming fix
|
2020-03-03 16:21:45 +01:00 |
|
|
maliakal_d
|
fac95516cf
|
moench: insignficant naming fix
|
2020-03-03 16:07:37 +01:00 |
|
|
maliakal_d
|
8abc32e7f1
|
moench: default pattern file in server, settings, tests
|
2020-03-03 16:00:01 +01:00 |
|
|
Erik Frojdh
|
1efacc9475
|
cleaning up headers
|
2020-03-03 11:33:28 +01:00 |
|
|
Erik Frojdh
|
b2d88b441a
|
removed comments
|
2020-03-03 11:17:26 +01:00 |
|
|
Erik Frojdh
|
75e083ae46
|
find tests and commands
|
2020-03-03 11:04:05 +01:00 |
|
|
Erik Frojdh
|
9699e064d3
|
WIP
|
2020-03-03 10:12:26 +01:00 |
|
|
Erik Frojdh
|
c6c3a68520
|
WIP
|
2020-03-03 10:08:20 +01:00 |
|
|
Erik Frojdh
|
5e92c5b67e
|
WIP
|
2020-03-03 09:38:05 +01:00 |
|
|
Erik Frojdh
|
0947cefe08
|
WIP
|
2020-03-03 09:29:25 +01:00 |
|
|
maliakal_d
|
6bbcf6173d
|
moench: first version
|
2020-03-02 18:34:10 +01:00 |
|
 bergamaschi
|
ecc3b36204
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-03-02 14:50:48 +01:00 |
|
|
Erik Frojdh
|
3e88beb8a5
|
O3 as default and option for mtune
2020.03.02.dev0
|
2020-03-02 13:50:16 +01:00 |
|
|
Erik Frojdh
|
cce659d98c
|
deploy only on tags
|
2020-03-02 13:12:46 +01:00 |
|
|
Erik Frojdh
|
95d56ad545
|
lookup
|
2020-03-02 11:57:35 +01:00 |
|
|
Erik Frojdh
|
84cd4d8436
|
generated python funcs
|
2020-03-02 11:34:30 +01:00 |
|
|
maliakal_d
|
d7319968a7
|
gui: always show gain plots, include intensity ticks(2d), channels number and gain ticks(1d)
|
2020-02-28 17:28:44 +01:00 |
|
|
maliakal_d
|
a769f7515c
|
gotthard2 bug fix: fixed pll freq was incorrect when 0 in front
|
2020-02-28 16:03:15 +01:00 |
|
|
Dhanya Thattil
|
11e7737a2f
|
gotthard2: timingsource and currentsource features, (timing source external yet to be implemented in fpga to test (#80)
|
2020-02-28 12:45:02 +01:00 |
|
|
bergamaschi
|
913df8ecae
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-28 12:26:48 +01:00 |
|
|
bergamaschi
|
c10e04c4eb
|
explicitly setting rx zmq datastream int the ctb Gui
|
2020-02-28 12:25:48 +01:00 |
|
|
maliakal_d
|
2e2e91b219
|
ctb adc: get in uV and print in client in mV to get decimals
|
2020-02-27 15:43:42 +01:00 |
|
|
maliakal_d
|
10ba16a9dc
|
updating versions
|
2020-02-27 14:26:18 +01:00 |
|
|
maliakal_d
|
8c8032dc69
|
ctb bug fix: slow adcs incorrect mv read out, needed clk down and usleep before reading
|
2020-02-27 09:16:22 +01:00 |
|
|
maliakal_d
|
90acd51389
|
server api changes: for mythen3, jungfrau, eiger as well
|
2020-02-26 17:52:35 +01:00 |
|
|
maliakal_d
|
f38ed8706f
|
removing gui warnings from qwt section
|
2020-02-26 16:56:41 +01:00 |
|
|
Dhanya Thattil
|
300b0c8105
|
Merge pull request #79 from slsdetectorgroup/bursts
Bursts
|
2020-02-26 11:29:05 +01:00 |
|
|
maliakal_d
|
d9cfc59df6
|
code refactor in slsdet: prevval for setnumtriggers
|
2020-02-26 11:27:24 +01:00 |
|
|
maliakal_d
|
80304c2eaf
|
multi progress calculated in one function rather getting all of them from shm
|
2020-02-26 11:17:49 +01:00 |
|
|
maliakal_d
|
fe3a7b0faf
|
gotthard2: removed unnecessary casting
|
2020-02-26 11:02:28 +01:00 |
|
|
maliakal_d
|
e66d42a43d
|
old form fix
|
2020-02-26 10:28:45 +01:00 |
|
|
maliakal_d
|
ec76590f28
|
Merge branch 'developer' into bursts
|
2020-02-26 09:29:18 +01:00 |
|
|
maliakal_d
|
2fcb2bff75
|
dac tests
|
2020-02-26 09:29:06 +01:00 |
|
|
maliakal_d
|
2310b5e55d
|
Merge branch 'developer' into bursts
|
2020-02-25 20:03:18 +01:00 |
|
|
maliakal_d
|
dca2d098a9
|
gui: hide gain legend
|
2020-02-25 20:03:09 +01:00 |
|
|
maliakal_d
|
462bc2e70c
|
Merge branch 'developer' into bursts
|
2020-02-25 18:22:58 +01:00 |
|
|
maliakal_d
|
2da3d179ee
|
gotthard2 gain plot in gui
|
2020-02-25 18:22:18 +01:00 |
|
|
maliakal_d
|
5e6a3b7e3d
|
merge resolved
|
2020-02-25 15:48:41 +01:00 |
|
|
maliakal_d
|
6a0a931e3e
|
gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes
|
2020-02-25 15:45:40 +01:00 |
|
|
Erik Frojdh
|
2bec476b4f
|
fixed failed tests
|
2020-02-25 09:26:57 +01:00 |
|
|
maliakal_d
|
f902bb06ad
|
gui bug fix: trigger timing mode was disconnected
|
2020-02-24 17:40:00 +01:00 |
|
|
maliakal_d
|
c03bc4a6b4
|
gotthard2: copy #frames and period when switching between continuous and burst mode
|
2020-02-24 17:20:51 +01:00 |
|
|
maliakal_d
|
6118567959
|
gotthard2 gui bug fix: gainbit not masked out
|
2020-02-24 17:04:37 +01:00 |
|