|
|
aa99309caf
|
Merge branch 'jungfrau2.0' into developer
|
2019-05-28 10:32:01 +02:00 |
|
|
|
a0f697ce71
|
jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top
|
2019-05-28 10:31:36 +02:00 |
|
Erik Frojdh
|
14dd753397
|
updated build nr
|
2019-05-27 16:59:42 +02:00 |
|
|
|
7e43472b7b
|
minor help editing
|
2019-05-27 16:29:56 +02:00 |
|
Erik Frojdh
|
ac7c85029c
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-27 16:22:04 +02:00 |
|
Erik Frojdh
|
639ea0eb56
|
Merge branch 'condabuild' into developer
|
2019-05-27 16:11:57 +02:00 |
|
|
|
659e204b35
|
solved conflicts
|
2019-05-27 15:05:40 +02:00 |
|
|
|
2c2fb7358c
|
jungfrau board 2 adc defines, full speed limitation for old boards
|
2019-05-27 15:04:13 +02:00 |
|
Erik Frojdh
|
d3646f0ac5
|
pinned conda-build version
|
2019-05-27 14:33:17 +02:00 |
|
Dhanya Thattil
|
54a396065d
|
ctb versioning bug fix
|
2019-05-27 14:08:41 +02:00 |
|
|
|
7fdab08256
|
ctb receiver fix: extract in 8 bit batches instead of 32 for less padding
|
2019-05-27 11:30:54 +02:00 |
|
Erik Frojdh
|
e2ef043e04
|
removed old configure file
|
2019-05-24 16:31:25 +02:00 |
|
Erik Frojdh
|
43dc9df6db
|
removed unused scripts
|
2019-05-24 10:25:34 +02:00 |
|
|
|
10f89599e0
|
bug fix: hdf5 printError still called once. replcaed with printErrorStack
|
2019-05-22 19:11:35 +02:00 |
|
Erik Frojdh
|
452fd1e457
|
new defaults for CMake
|
2019-05-22 09:45:08 +02:00 |
|
|
|
7b817fa194
|
Merge branch 'developer' into jungfrauv0.8
|
2019-05-17 19:21:01 +02:00 |
|
|
|
1a1c6b9b42
|
jungfrau server: feature finish: switching between 2 interfaces
|
2019-05-17 19:19:03 +02:00 |
|
Erik Frojdh
|
3e5d34647e
|
updated test for argument parser
|
2019-05-17 10:00:49 +02:00 |
|
Erik Frojdh
|
591ff53b84
|
fixed MacAddr 0 output
|
2019-05-17 09:08:13 +02:00 |
|
Erik Frojdh
|
fff79fbbb6
|
const char* for command
|
2019-05-16 16:58:03 +02:00 |
|
|
|
1943e77b24
|
server interface: ip made to use inet_ntop, mac address and ip to string made common
|
2019-05-16 15:12:42 +02:00 |
|
|
|
9315768159
|
client bug fix: smaller ips convert to hex
|
2019-05-16 14:07:58 +02:00 |
|
Erik Fröjdh
|
f1a1391866
|
Factored out time conversion (#23)
* time conversion
* with comment
* lround in slsDetectorCommand
|
2019-05-15 10:22:38 +02:00 |
|
Erik Fröjdh
|
877bdb8979
|
Using FixedCapacityContainer for rxDbitList (#22)
* fixed capacity container
* changed shm date
|
2019-05-15 09:16:18 +02:00 |
|
Erik Frojdh
|
bf0847e967
|
removed ClientInterface
|
2019-05-15 08:38:49 +02:00 |
|
|
|
97dd329a7b
|
client: zmqip bug fix (typo with strlen)
|
2019-05-14 18:57:39 +02:00 |
|
|
|
6847175743
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-14 18:38:42 +02:00 |
|
|
|
f90d8c6aff
|
ctb server: added adcvpp option to get and in mv
|
2019-05-14 18:38:30 +02:00 |
|
|
|
45ae8a41ab
|
updating eiger server
|
2019-05-14 17:43:34 +02:00 |
|
Erik Frojdh
|
24fc5de58d
|
clang-tidy header include order
|
2019-05-14 17:34:51 +02:00 |
|
Erik Frojdh
|
7314c52c63
|
removed unneccecary includes
|
2019-05-14 17:32:21 +02:00 |
|
Erik Frojdh
|
bc4d0452af
|
removed unused error_defs.h
|
2019-05-14 17:25:43 +02:00 |
|
Erik Frojdh
|
97692ae3ab
|
moved from c headers
|
2019-05-14 17:17:21 +02:00 |
|
Erik Frojdh
|
55f482f915
|
clang-tidy nullptr
|
2019-05-14 17:11:27 +02:00 |
|
Erik Frojdh
|
74d67261a9
|
no check for null when deleting
|
2019-05-14 17:09:24 +02:00 |
|
|
|
741ee3b44c
|
ctb server bug fix: udp ip not reset before overwriting (smaller size creates problems)
|
2019-05-14 17:08:07 +02:00 |
|
Erik Frojdh
|
29be6f3b34
|
no check for null when deleting
|
2019-05-14 17:07:56 +02:00 |
|
Erik Frojdh
|
81e858ea4d
|
clang-tidy implicit bool
|
2019-05-14 17:05:27 +02:00 |
|
Erik Frojdh
|
0f8d099196
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-14 16:53:59 +02:00 |
|
Erik Frojdh
|
ab5aa78b8a
|
clang-tidy modernize
|
2019-05-14 16:53:50 +02:00 |
|
|
|
3f6736ad23
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-14 16:44:09 +02:00 |
|
|
|
3e654977ca
|
slsReceiver bug fix in ctb extracting digital bits
|
2019-05-14 16:41:25 +02:00 |
|
Erik Frojdh
|
1029ce9705
|
minor
|
2019-05-14 14:53:59 +02:00 |
|
|
|
d114f8db90
|
receiver bug fix: ctb extractng bits source pointer bug
|
2019-05-14 11:43:45 +02:00 |
|
Erik Frojdh
|
9fd2866fc0
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-14 11:41:50 +02:00 |
|
Erik Frojdh
|
aff6e30b65
|
short sleep in socket test
|
2019-05-14 11:41:39 +02:00 |
|
Erik Fröjdh
|
0224dccd2e
|
Added noexcept and constexpr (#21)
* noexcept and constexpr
* check size
|
2019-05-14 11:08:25 +02:00 |
|
Erik Frojdh
|
fbada2e81a
|
commented qwt for now
|
2019-05-14 10:13:24 +02:00 |
|
Erik Fröjdh
|
40d88002c0
|
Merge pull request #20 from slsdetectorgroup/fix-conda-install-instructions
Fix typo in conda install instructions
|
2019-05-13 15:31:24 +02:00 |
|
Samuel Debionne
|
3a8c7c6e2a
|
Fix typo in conda install instructions
|
2019-05-13 10:58:54 +02:00 |
|
