Erik Frojdh
|
40c5ccfe37
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-03-19 10:30:15 +01:00 |
|
Erik Frojdh
|
bf1b1a2d9e
|
string conversion for uint
|
2020-03-19 10:30:05 +01:00 |
|
|
|
b608ec6fbd
|
zmqsocket: fname to string to remove warning in copying maxstr in maxstr in json header
|
2020-03-19 10:24:08 +01:00 |
|
Dhanya Thattil
|
4813b5567a
|
Minimal shared memory for receiver
|
2020-03-19 07:01:32 +01:00 |
|
Erik Frojdh
|
b751238fc1
|
ZmqSocket
|
2020-03-18 12:12:01 +01:00 |
|
Erik Frojdh
|
e7e201bd2a
|
export and include
|
2020-03-18 10:20:01 +01:00 |
|
|
|
17227be4df
|
gotthard2: burst mode fix
|
2020-03-13 17:39:16 +01:00 |
|
Erik Frojdh
|
6809bd6567
|
removed header
|
2020-03-12 12:38:00 +01:00 |
|
Erik Frojdh
|
3dbd6a33f7
|
removed genericSocket
|
2020-03-11 13:39:40 +01:00 |
|
Erik Frojdh
|
0de0d82a1a
|
replaced old logger
|
2020-03-11 12:40:12 +01:00 |
|
Erik Frojdh
|
4aeb8bf62e
|
introducing new logger
|
2020-03-11 10:54:55 +01:00 |
|
|
|
dea8cba985
|
changes from 4.2.0-rc: eiger check for max trimbits; end of eigerserver: if detector ip, set activate; update both control and stop server for activate
|
2020-03-10 16:49:08 +01:00 |
|
|
|
2cb09a590a
|
gotthard2, mythen3: firmware type check added, others: minor print
|
2020-03-10 16:25:07 +01:00 |
|
|
|
df2512fb1c
|
all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated
|
2020-03-10 15:57:27 +01:00 |
|
Dhanya Thattil
|
758afad02c
|
ctb, moench, eiger, gotthard: get number of channels for moench and ctb, others removed unnecessary variables in shm, added moench virtual sever (#86)
|
2020-03-10 09:08:08 +01:00 |
|
Dhanya Thattil
|
4c4ee3ae25
|
Merge pull request #83 from slsdetectorgroup/logger
New logger
|
2020-03-09 17:46:18 +01:00 |
|
Erik Frojdh
|
0e171f291d
|
added std::flush
|
2020-03-09 13:57:50 +01:00 |
|
|
|
f255becffe
|
jungfrau: adcphase values nad dbit values done for new boards
|
2020-03-06 17:49:22 +01:00 |
|
|
|
a2e019ff36
|
moench: updated adcpipeline from 14 to 15
|
2020-03-06 10:47:21 +01:00 |
|
|
|
aeb9ddfe62
|
moench:dbit clock updated to 40
|
2020-03-05 17:10:37 +01:00 |
|
|
|
4a802bd2e4
|
gotthard2: switching between continuous to burst mode (burstperiod got reset: fixed)
|
2020-03-05 16:35:52 +01:00 |
|
|
|
e3f9ef0b25
|
moench and eiger updated as well
|
2020-03-05 10:24:59 +01:00 |
|
|
|
9ca86c2edb
|
ctb, gotthard, gotthard2, jungfrau, mythen updated
|
2020-03-05 10:21:24 +01:00 |
|
Dhanya Thattil
|
c64b09ee79
|
Jungfraufix (#84)
* jungfrau: added dbitphase, different pll clkindex 0 with different wr bit
|
2020-03-04 17:06:18 +01:00 |
|
Erik Frojdh
|
c6ddd19c0f
|
WIP
|
2020-03-04 15:38:21 +01:00 |
|
Erik Frojdh
|
661adaf4ed
|
WIP
|
2020-03-04 15:25:49 +01:00 |
|
|
|
4e2f685b76
|
gotthard2: gain plot fix with clones
|
2020-03-04 14:39:44 +01:00 |
|
Erik Frojdh
|
ff9c37701b
|
WIP
|
2020-03-04 12:35:41 +01:00 |
|
|
|
7859cf78e9
|
moench: allow power chip
|
2020-03-04 10:41:10 +01:00 |
|
|
|
1b996d1703
|
revised gain plot; updated version api
|
2020-03-04 10:25:38 +01:00 |
|
|
|
032475fc14
|
gainplot clone revised
|
2020-03-04 10:17:51 +01:00 |
|
|
|
5430288ce8
|
merge fix
|
2020-03-03 17:57:55 +01:00 |
|
|
|
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 |
|
Erik Frojdh
|
3431752649
|
WIP
|
2020-03-03 17:01:45 +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 |
|
|
|
10ba16a9dc
|
updating versions
|
2020-02-27 14:26:18 +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 |
|
|
|
90acd51389
|
server api changes: for mythen3, jungfrau, eiger as well
|
2020-02-26 17:52:35 +01:00 |
|
|
|
fe3a7b0faf
|
gotthard2: removed unnecessary casting
|
2020-02-26 11:02:28 +01:00 |
|
|
|
5e6a3b7e3d
|
merge resolved
|
2020-02-25 15:48:41 +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 |
|
Erik Frojdh
|
2bec476b4f
|
fixed failed tests
|
2020-02-25 09:26:57 +01:00 |
|
|
|
02b367ffe8
|
mythen3 and gotthard2: updated clocks
|
2020-02-24 16:50:47 +01:00 |
|
|
|
21a1b872bf
|
bugfix:mythen3 date change
|
2020-02-24 11:00:16 +01:00 |
|
|
|
3a74ca8fc2
|
bugfix: mythen3 git date incorrect
|
2020-02-24 10:53:06 +01:00 |
|
|
|
8953235268
|
reverted to UdpRxSocket.h version of revision fc27cfd (with gcc problem fixed)
|
2020-02-21 11:07:24 +01:00 |
|
Erik Frojdh
|
52a89cbcc5
|
fix for older gcc
|
2020-02-18 17:54:28 +01:00 |
|
