Dhanya Thattil
|
c64b09ee79
|
Jungfraufix (#84)
* jungfrau: added dbitphase, different pll clkindex 0 with different wr bit
|
2020-03-04 17:06:18 +01:00 |
|
|
|
7859cf78e9
|
moench: allow power chip
|
2020-03-04 10:41:10 +01:00 |
|
|
|
fca7d51cb4
|
moench: removed hardcoding ny in call back for gui
|
2020-03-03 16:30:28 +01:00 |
|
|
|
8abc32e7f1
|
moench: default pattern file in server, settings, tests
|
2020-03-03 16:00:01 +01:00 |
|
|
|
6bbcf6173d
|
moench: first version
|
2020-03-02 18:34:10 +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 |
|
|
|
2e2e91b219
|
ctb adc: get in uV and print in client in mV to get decimals
|
2020-02-27 15:43:42 +01:00 |
|
|
|
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 |
|
|
|
d9cfc59df6
|
code refactor in slsdet: prevval for setnumtriggers
|
2020-02-26 11:27:24 +01:00 |
|
|
|
80304c2eaf
|
multi progress calculated in one function rather getting all of them from shm
|
2020-02-26 11:17:49 +01:00 |
|
|
|
ec76590f28
|
Merge branch 'developer' into bursts
|
2020-02-26 09:29:18 +01:00 |
|
|
|
2fcb2bff75
|
dac tests
|
2020-02-26 09:29:06 +01:00 |
|
|
|
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 |
|
|
|
f4b922165f
|
bugfix from earlier commit: dr in readfromreceiver commented out
|
2020-02-24 10:36:52 +01:00 |
|
|
|
fc27cfd663
|
merging problem
|
2020-02-18 10:55:41 +01:00 |
|
|
|
6b0bf02a85
|
Some fixes to use moench
|
2020-02-18 10:45:53 +01:00 |
|
Erik Frojdh
|
f1bce15a57
|
replaced udp socket
|
2020-02-17 17:43:14 +01:00 |
|
|
|
d3dc9a7690
|
gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging
|
2020-02-04 12:23:58 +01:00 |
|
Dhanya Thattil
|
94fcf52e64
|
Merge pull request #76 from slsdetectorgroup/exec
Buffern in exec
|
2020-02-04 10:59:48 +01:00 |
|
Erik Frojdh
|
b9446f40d1
|
fmt and minor
|
2020-02-04 10:11:27 +01:00 |
|
Erik Frojdh
|
e6340456f6
|
minor
|
2020-02-04 08:47:22 +01:00 |
|
Erik Frojdh
|
f42d591845
|
sizeof
|
2020-02-03 16:51:57 +01:00 |
|
Erik Frojdh
|
e9029ba8f2
|
removed unused functions
|
2020-02-03 16:44:14 +01:00 |
|
Erik Frojdh
|
121747352d
|
buffer
|
2020-02-03 16:35:30 +01:00 |
|
Erik Frojdh
|
a829e69313
|
minor
|
2020-02-03 16:00:24 +01:00 |
|
Erik Frojdh
|
972f21258a
|
renamed multiSlsDetector
|
2020-02-03 14:57:37 +01:00 |
|
|
|
93ab8d05d7
|
eiger: change speed to full speed for dr of 4, 8, 16
|
2020-02-03 11:37:43 +01:00 |
|
|
|
e432e6f90d
|
4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back
|
2020-02-03 11:25:19 +01:00 |
|
|
|
f0cccf9de8
|
initialchecks can be bypassed (version compatibility and oher tests at server start up)
|
2020-01-31 16:46:33 +01:00 |
|
|
|
89c774dbf7
|
nios programming: check file size first
|
2020-01-31 11:24:48 +01:00 |
|
Dhanya Thattil
|
5ca3a1b685
|
gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming (#74)
|
2020-01-30 19:52:35 -08:00 |
|
|
|
7d7302a90c
|
mnior
|
2020-01-29 14:38:19 +01:00 |
|
|
|
ac3230c656
|
gotthard2 testing
|
2020-01-29 14:34:23 +01:00 |
|
|
|
69897d4c78
|
WIP testing
|
2020-01-27 13:56:44 +01:00 |
|
|
|
41035808e9
|
merge from mythen3 and gotthard2
|
2020-01-24 15:08:58 +01:00 |
|
|
|
a9e375ed34
|
gotthard2: bursttype to burstmode
|
2020-01-23 11:03:14 +01:00 |
|
|
|
f881133795
|
get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2
|
2020-01-22 18:18:56 +01:00 |
|
|
|
8cbf3c62a9
|
merge from developer
|
2020-01-22 17:30:13 +01:00 |
|
|
|
3ea2520615
|
PR minor changes
|
2020-01-22 13:55:10 +01:00 |
|
|
|
1dea112742
|
adding gotthard2 tests
|
2020-01-22 11:35:29 +01:00 |
|
|
|
981b13494c
|
mythen3: virtual server, connected timing mode, row and col in header, included pattern bit and mask
|
2020-01-21 18:16:27 +01:00 |
|
|
|
9c89f6a63d
|
Merge branch 'developer' into gotthard2
|
2020-01-21 16:05:04 +01:00 |
|
|
|
e746256653
|
gotthard2: gain updated
|
2020-01-21 16:01:38 +01:00 |
|
|
|
bdf3a010c3
|
updated client doc for gotthard2: the timers that are used in continuous mode only
|
2020-01-21 10:26:11 +01:00 |
|
|
|
65d95480bd
|
mythen3 bug fix: rxr needs to update dr
|
2020-01-20 13:50:50 +01:00 |
|
|
|
6cfd0f8962
|
gotthard2: first edit
|
2020-01-20 12:13:23 +01:00 |
|
|
|
95030bc55f
|
Merge branch 'developer' into gotthard2
|
2020-01-16 16:52:08 +01:00 |
|
Erik Frojdh
|
c1fac7cdb7
|
fixed conversion for IpAddr
|
2020-01-16 16:31:11 +01:00 |
|
|
|
e8bdf5a505
|
gotthard2: updated register map; powerchip checking detector type; internal and external period, frames, exptime; set/get delay, get actualtime, measurement, framesfromstart enabled; which detector comment updated in cmdproxy, detector and slsdetector
|
2020-01-16 15:33:35 +01:00 |
|
Erik Frojdh
|
f3598c1f39
|
nullptr
|
2020-01-16 14:17:57 +01:00 |
|
