|
|
be33102164
|
checkonline, checkrecieveronline, retval has offline hostnames, online flag should be set no matter what the outcome
|
2019-03-14 13:18:42 +01:00 |
|
|
|
5235a87e93
|
Merge branch 'detshm' into refactor
|
2019-03-14 12:42:08 +01:00 |
|
|
|
cb687d805e
|
merge conflict
|
2019-03-14 12:41:37 +01:00 |
|
|
|
327d08a016
|
removing comments, added one check for nullptr, updated current threshold when getting module, removing unsued function from header file (writesettingsfile)
|
2019-03-14 12:40:01 +01:00 |
|
Erik Frojdh
|
1960460e43
|
upgraded catch to 2.7
|
2019-03-14 10:47:43 +01:00 |
|
Erik Frojdh
|
e42e8f5bf6
|
option for sanitizers
|
2019-03-14 10:44:31 +01:00 |
|
Erik Frojdh
|
c9422befff
|
fixed loading trimbits
|
2019-03-14 10:21:18 +01:00 |
|
|
|
c56efdec8a
|
Merge branch 'refactor' into detshm
|
2019-03-14 09:11:27 +01:00 |
|
|
|
14131f93f1
|
sanitizer compile fail
|
2019-03-14 09:06:44 +01:00 |
|
Erik Frojdh
|
d21ceb0e75
|
only construct shared memory from a type with exact size
|
2019-03-13 17:43:48 +01:00 |
|
Erik Frojdh
|
9a08c85b2a
|
changed the shared memory of slsDetector
|
2019-03-13 17:38:27 +01:00 |
|
Erik Frojdh
|
85134443de
|
initial
|
2019-03-13 16:29:29 +01:00 |
|
|
|
7d3d2a8b31
|
ctb and moench server: pll vco clock changed from 400 to 800,ctb server: max adc clock from 40 to 65MHz
|
2019-03-13 16:03:11 +01:00 |
|
|
|
75ce111344
|
Merge branch 'shm' into refactor
|
2019-03-13 15:21:12 +01:00 |
|
|
|
f8aa0e3d6d
|
removed minor commented lines
|
2019-03-13 15:19:32 +01:00 |
|
|
|
2dcef909ca
|
Merge branch 'refactor' into shm
|
2019-03-13 14:22:26 +01:00 |
|
|
|
ec18db868f
|
ctb, moench, jungfrau server: changing phase only changes one clock in one direction. ctb and moench phase shift connected to adc clk, instead of run clk
|
2019-03-13 08:37:45 +01:00 |
|
Erik Frojdh
|
7e793539ca
|
removed typedef for shared struct
|
2019-03-12 14:42:27 +01:00 |
|
Erik Frojdh
|
d4e4fb8ffe
|
move constructor deleted copy constructor
|
2019-03-12 14:37:06 +01:00 |
|
Erik Frojdh
|
48e4cec56f
|
minor
|
2019-03-12 11:52:13 +01:00 |
|
Erik Frojdh
|
3b2c734efd
|
adding tests
|
2019-03-12 11:43:28 +01:00 |
|
Erik Frojdh
|
507a22ac05
|
default args
|
2019-03-12 10:14:24 +01:00 |
|
Erik Frojdh
|
a01d68a61f
|
initial changes
|
2019-03-12 08:22:07 +01:00 |
|
|
|
6765fd0dc8
|
ctb moench: bugfix for fifofull, should not read pattern, same as executing it
|
2019-03-08 16:59:44 +01:00 |
|
|
|
ae5938799f
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-08 16:16:53 +01:00 |
|
|
|
19b21dac88
|
Listener bug fix: switching to make_unique ptr side effects, the dummy socket still alive when destructor of listener called
|
2019-03-08 16:16:40 +01:00 |
|
Erik Frojdh
|
b8f071dcf6
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-08 15:13:23 +01:00 |
|
Erik Frojdh
|
182f65bc2f
|
always compile commands
|
2019-03-08 15:13:11 +01:00 |
|
|
|
1103f56256
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-08 09:14:39 +01:00 |
|
|
|
0553755439
|
receiver bug fix: with refactor, the callbacks were getting reset upon initialization. fixed
|
2019-03-08 09:14:29 +01:00 |
|
Gemma Tinti
|
65b8ab5b89
|
manual
|
2019-03-07 17:40:56 +01:00 |
|
|
|
658438df3b
|
ctb moench server update: (fw update): det id changed, status reg looks at anyfifofull instead of somefifofull, datapresent looks at corresponding analog/digital fifo empty, usleep after read strobe to sync different clock
|
2019-03-07 17:36:35 +01:00 |
|
Dhanya Thattil
|
999a2f4d15
|
Merge pull request #8 from slsdetectorgroup/use-unique-ptr
In Listener, remove raw pointers allocations, use `unique_ptr` instead.
|
2019-03-06 17:48:28 +01:00 |
|
|
|
2532df37cc
|
client: added basic fail handling where ommitted
|
2019-03-06 17:37:13 +01:00 |
|
|
|
ca817c6ae9
|
client: update roi on updatedetector, (ctb, moench)moved nchans and databyte calculated to updatenumberofchannels and called for any update in roi, readoutflag or #samples changed (get should not update). ctb,moench server: roi fixed, . gotthard server: bug fix waiting to finish, ad9252 spi call fix. receiver: updated for moench and 10g
|
2019-03-06 17:25:18 +01:00 |
|
|
|
0765b330f1
|
ctb and moench, exptime connects to set pattern wait time with level 0
|
2019-03-06 15:17:54 +01:00 |
|
|
|
abc7a9bd2f
|
moench has only analog readout
|
2019-03-06 14:52:21 +01:00 |
|
|
|
2676e8b43d
|
receiver: readout flag bug fix, clent:send roi for ctb and moench
|
2019-03-06 10:55:51 +01:00 |
|
|
|
d3c1193a71
|
ctb/moench server, fixed frequency configuring bug, readpattern sleep, detectormode command, jsonheader set even if rxr offline, set speed returnvalue is value not ok/fail, rxr printout missingpackets 64 bit
|
2019-03-06 10:25:16 +01:00 |
|
Samuel Debionne
|
db232ad00d
|
in Listener, remove raw pointers allocations, use unique_ptr instead.
Add an overload of sls::make_unique for array types.
|
2019-03-06 09:07:51 +01:00 |
|
Dhanya Thattil
|
ceb515d517
|
Merge pull request #7 from slsdetectorgroup/fix-sprintf-warnings
Fix sprintf warnings
|
2019-03-05 16:26:18 +01:00 |
|
Samuel Debionne
|
04c8a2871d
|
Fix sprintf warnings
|
2019-03-05 14:34:01 +01:00 |
|
Dhanya Thattil
|
1803a5aecc
|
Merge pull request #6 from slsdetectorgroup/fix-typos
Fix typos
|
2019-03-05 14:19:19 +01:00 |
|
Samuel Debionne
|
c40db94474
|
Fix typos
|
2019-03-05 10:43:20 +01:00 |
|
|
|
c56561bc9f
|
updated ctb and moench, moench not tested
|
2019-03-05 09:38:10 +01:00 |
|
|
|
08bd2378f4
|
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
|
2019-03-04 09:41:20 +01:00 |
|
|
|
8939e23622
|
jungfrau feature:storagecell_delay added
|
2019-03-01 15:26:38 +01:00 |
|
|
|
93192c6e84
|
bugfix receiver: setImagesize only for ctb, moench
|
2019-03-01 15:22:39 +01:00 |
|
|
|
d2d50a56df
|
eiger server/client bug fix: readout flag of -1
|
2019-03-01 14:08:28 +01:00 |
|
|
|
8c067437e6
|
ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions
|
2019-03-01 12:28:11 +01:00 |
|
