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 |
|
Dhanya Thattil
|
2acf64b09c
|
gui changes (#87)
|
2020-03-11 10:08:30 +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 |
|
|
9467b4c610
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-03-10 16:25:15 +01:00 |
|
|
2cb09a590a
|
gotthard2, mythen3: firmware type check added, others: minor print
|
2020-03-10 16:25:07 +01:00 |
|
Erik Frojdh
|
5900403f20
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-03-10 16:10:09 +01:00 |
|
Erik Frojdh
|
53749c3b77
|
clean
|
2020-03-10 16:09:59 +01:00 |
|
|
1d2f4a8af0
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-03-10 15:59:35 +01:00 |
|
|
df2512fb1c
|
all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated
|
2020-03-10 15:57:27 +01:00 |
|
|
e4942a5c8d
|
virtual servers warnings fixed
|
2020-03-10 15:53:44 +01:00 |
|
|
ac1c40d6f9
|
virtual servers: redundant declarations fixed
|
2020-03-10 15:50:33 +01:00 |
|
Erik Frojdh
|
8ba0ef093e
|
cmap
|
2020-03-10 15:50:14 +01:00 |
|
Erik Frojdh
|
cb268aa43f
|
cmap
|
2020-03-10 15:49:54 +01:00 |
|
|
5192dae9c5
|
removed virtual server warnings
|
2020-03-10 15:15:09 +01:00 |
|
Erik Frojdh
|
d818e2570f
|
clang-tidy nullptr
|
2020-03-10 15:06:51 +01:00 |
|
Erik Frojdh
|
ee799b540a
|
removed redundant includes etc.
|
2020-03-10 11:12:00 +01:00 |
|
Erik Frojdh
|
ae3189d836
|
changed cxx to cpp
|
2020-03-10 10:28:27 +01:00 |
|
Erik Frojdh
|
9ede0629ef
|
clang format on gui
|
2020-03-10 10:18:52 +01:00 |
|
Erik Frojdh
|
bd6529a64c
|
warnings for virtual servers
|
2020-03-10 09:27:23 +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
|
013836bea5
|
Merge pull request #85 from slsdetectorgroup/qwtifdef
Version defs and checking pointer before delete
|
2020-03-09 18:06:25 +01:00 |
|
Dhanya Thattil
|
de6808b170
|
Update CMakeLists.txt
qwt minimum 6.1
|
2020-03-09 18:05:27 +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 |
|
Erik Frojdh
|
bd47c969dd
|
WIP
|
2020-03-09 12:49:24 +01:00 |
|
Erik Frojdh
|
e4a86e544a
|
WIP
|
2020-03-09 12:42:57 +01:00 |
|
|
a4fa9ff480
|
gui: scroll area uniquie pointers to remove mem leak
|
2020-03-06 19:44:44 +01:00 |
|
|
908afc790d
|
jungfrau: new firmware version
2020.03.06.dev0
|
2020-03-06 18:08:08 +01:00 |
|
|
d6e174ea11
|
jungfrau: adc phase changed again
|
2020-03-06 17:54:38 +01:00 |
|
|
f255becffe
|
jungfrau: adcphase values nad dbit values done for new boards
|
2020-03-06 17:49:22 +01:00 |
|
|
0a596c689b
|
sanitizer on, gui:removed qfuture, client: not implemented made specific as to what is not
|
2020-03-06 15:41:15 +01:00 |
|
|
a2e019ff36
|
moench: updated adcpipeline from 14 to 15
|
2020-03-06 10:47:21 +01:00 |
|
|
959d62ed66
|
moench: default clocks and phase are same as ctb at startup
|
2020-03-05 18:03:53 +01:00 |
|
|
1d2a46cdbe
|
moench:dsamples=0 at startup
|
2020-03-05 17:13:58 +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 |
|
|
c2639854fa
|
ctb gui works with moench detector
|
2020-03-05 14:53:24 +01:00 |
|
|
dec4d00fbf
|
ctb: gui call back fix
|
2020-03-05 11:31:36 +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 |
|
|
6e4a3353a3
|
moench: removed commented out settings
|
2020-03-04 13:53:28 +01:00 |
|
|
042e5715e6
|
conflict fix
|
2020-03-04 13:51:58 +01:00 |
|
|
e143204ce1
|
Corrected settings and patter for moench detector
|
2020-03-04 13:33:42 +01:00 |
|
Erik Frojdh
|
ff9c37701b
|
WIP
|
2020-03-04 12:35:41 +01:00 |
|