Erik Frojdh
6759b2eeb8
refactor getID
2019-03-19 16:27:07 +01:00
Erik Frojdh
38bf540c1a
fixed segfault on loading trimbits
2019-03-18 18:10:50 +01:00
Erik Frojdh
43012e4f28
more const more python
2019-03-18 17:38:44 +01:00
Erik Frojdh
4036e6af8d
const qualified multi calls, python fixes
2019-03-18 12:06:39 +01:00
Erik Frojdh
c153be95d1
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-03-15 10:15:50 +01:00
Erik Frojdh
4943983d10
det id const and ini shm in constructor
2019-03-15 10:15:42 +01:00
5fe7a86361
switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message
2019-03-15 10:00:22 +01:00
Erik Frojdh
bad44f5bf4
moving SharedMemory into namespace sls
2019-03-14 16:51:38 +01:00
Erik Frojdh
40d2f66146
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-03-14 16:37:46 +01:00
Erik Frojdh
9639e480d9
new exceptions
2019-03-14 16:37:36 +01:00
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
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
c9422befff
fixed loading trimbits
2019-03-14 10:21:18 +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
f8aa0e3d6d
removed minor commented lines
2019-03-13 15:19:32 +01:00
Erik Frojdh
d4e4fb8ffe
move constructor deleted copy constructor
2019-03-12 14:37:06 +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
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
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
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
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
1fe473e830
client: for set port functions, moved forceupdate outside to automatically close previous function call
2019-02-25 14:45:14 +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
4c7a9cd838
moench: set threshold energy and set roi sets jsonheader
2019-02-25 12:34:35 +01:00
c218e391bb
client: rx_tcpport fixed
2019-02-25 11:43:10 +01:00
43ad8b69b3
client: stop and control port get fixed
2019-02-25 09:35:07 +01:00
15fc55f914
client: must print detector or receiver returning error
2019-02-25 09:16:20 +01:00
421dbdb9b5
ctb server: including moench as well for programfpga and other client ctb implementations
2019-02-21 16:00:40 +01:00
a4f1b7670f
ctb server bug fixes:update client, get period left, getid(api and serial number), restrict setting vchip, allow write adc
2019-02-21 09:37:49 +01:00
09546a8632
ctb server:
...
- allowed flags resetfpga and programfpga for moench and ctb
- set a minimum voltage for vio as it powers the fpga (1200mV)
- changed the min and max for vchip and power regulators due to tolerance
- fixed pattern read function
- fixed minor bugs with input of ctb patterns(waittime) and mode other than 1
- fixed calibration current register for i2c for tolerance (/1.2268)
- fixed current readout of i2c
- added digital, analog and normal readouts for flags
2019-02-20 15:36:34 +01:00
722883531d
reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings
2019-02-14 17:43:28 +01:00
46aa7769cc
client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future
2019-02-13 20:19:08 +01:00
fd95550724
client: fix for json header values being integer
2019-02-13 12:43:56 +01:00
f9be8b89ac
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
2019-02-13 09:37:31 +01:00
a64b34610a
merge from developer (without the additional json header implementations)
2019-02-12 09:35:24 +01:00
