Erik Frojdh
ec17529c52
seperate get/set
2019-04-10 12:15:19 +02:00
Erik Frojdh
70b2a41d5e
clang tidy
2019-04-09 10:59:09 +02:00
Erik Frojdh
f11db00aef
removed old typedef
2019-04-05 10:14:41 +02:00
Erik Frojdh
05720c12ac
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-04-04 12:19:39 +02:00
Erik Frojdh
85516e42c0
trimEn now takes vector
2019-04-04 12:19:30 +02:00
b35a8f0650
ctb server updated
2019-04-04 11:51:37 +02:00
Erik Frojdh
c284b24397
operator<< test
2019-04-03 20:05:29 +02:00
Erik Frojdh
7256a1e422
added test
2019-04-03 19:59:37 +02:00
Erik Frojdh
0270e18882
new tests
2019-04-03 18:11:48 +02:00
Erik Frojdh
90b257a74d
warnings
2019-04-03 16:17:09 +02:00
Erik Frojdh
a7ab8aa9e6
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-04-03 14:48:04 +02:00
Erik Frojdh
3b4d36c3d4
bumped cmake to 3.5
2019-04-03 14:47:58 +02:00
bbfb5df30d
conflict resolved, changed to using hex() instead of str() in configuremac
2019-04-03 14:11:01 +02:00
Erik Frojdh
d6c0f7be05
constexpr
2019-04-02 17:59:59 +02:00
5131245f0a
all servers except eiger: easier to update firmware and software using update or copydetectorserver, rebootcontroller, and programfpga
2019-04-02 17:27:01 +02:00
Erik Frojdh
6fc388bf78
reset to info
2019-04-02 17:15:21 +02:00
Erik Frojdh
24f28f14f4
clean up
2019-04-02 17:00:00 +02:00
Erik Frojdh
b198b50377
class for Ip and Mac
2019-04-02 15:24:25 +02:00
Erik Frojdh
df2d67d90d
classes for ip and mac addr
2019-04-02 11:56:33 +02:00
Erik Frojdh
959d9aa5d1
cleaning and new functions
2019-04-01 10:36:47 +02:00
Erik Frojdh
05709e2f47
finished
2019-03-29 16:29:00 +01:00
Erik Frojdh
1fce125d47
Merge branch 'refactor' into address
2019-03-29 10:18:15 +01:00
Erik Frojdh
d134e54810
ip
2019-03-29 10:18:10 +01:00
Erik Frojdh
ed9dc3b386
fixed bug not clearing socket descriptor
2019-03-29 10:14:07 +01:00
Erik Frojdh
990848554c
midpoint
2019-03-28 16:16:41 +01:00
Erik Frojdh
94c4e4c352
new constuctor
2019-03-28 15:48:26 +01:00
c7c52c63cd
ctb & moench: phase fix for absolute within limits, option to set as degrees and get max phase shift, bug fix for eiger with implementation of 2 udp interface
2019-03-27 12:25:38 +01:00
7cd5bc8b2d
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
2019-03-26 15:00:19 +01:00
Erik Frojdh
c16f9b8c30
specify detector or receiver in error
2019-03-20 17:41:46 +01:00
Erik Fröjdh
03402d0e9e
Error handling with exceptions in slsDetector and multiSlsDetector ( #14 )
...
* less error mask
* removing error mask from slsDetector
* removed ErrorMask
* setonline, setreceiveornline bug fix
2019-03-20 16:23:41 +01:00
44f0dfc3c0
ctbserver: updated firmware version and api
2019-03-19 18:58:42 +01:00
Erik Frojdh
4e56107015
new socket overload
2019-03-19 17:49:20 +01:00
Erik Frojdh
6759b2eeb8
refactor getID
2019-03-19 16:27:07 +01:00
Erik Frojdh
4943983d10
det id const and ini shm in constructor
2019-03-15 10:15:42 +01:00
Erik Frojdh
9f724f0c0d
using only sls exceptions
2019-03-14 17:09:44 +01:00
Erik Frojdh
9639e480d9
new exceptions
2019-03-14 16:37:36 +01:00
Erik Frojdh
c9422befff
fixed loading trimbits
2019-03-14 10:21:18 +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
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
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
35b1ad39f7
ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive
2019-03-01 10:45:01 +01:00
bb81613900
ctb, moench: implemented led enable feature
2019-03-01 09:00:04 +01:00
debf3a1b01
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
2019-02-28 16:07:47 +01:00
7f2197fc4f
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
2019-02-28 10:09:54 +01:00
f80483de6e
ctb server: (bug fixes, udp sending feature instead of tcp, better debugging prints,
...
digital readout mode (fifoempty flag in status register is always up, so it is idle for this readout mode),
pattern loop bugs, max_pattern_length redefined in server side, do not update period for ctb and moench in setreceiver
2019-02-28 08:46:26 +01:00
966896b942
moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr
2019-02-25 12:57:44 +01:00
15fc55f914
client: must print detector or receiver returning error
2019-02-25 09:16:20 +01:00
f5244faa02
moench: adding enums for zmq parameters, needs modification in naming
2019-02-21 16:01:24 +01:00
Erik Frojdh
b52c6b05b8
link and format
2019-02-16 16:46:09 +01:00
