|
|
2815458652
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-12-06 10:55:32 +01:00 |
|
|
|
d8140d8db9
|
anna version
|
2018-12-06 10:55:18 +01:00 |
|
|
|
3a51d107bd
|
gotthard server bug fix: switching between roi and no roi has complex fnum reengineering as fnum and pnum doesnt exist for gotthard, sol at the moment: send an image when configuremac, identify first packet if first two channels is 0xcacacaca, ifthe fnum is odd, then increment. Looking at this only at first image in an acquisition, also reduces roi time by configuring mac only when setting roi, not when getting
|
2018-12-04 12:09:46 +01:00 |
|
|
|
03e7a83e74
|
incorrect mac address in config file should set error flag and give fail upon calling readconfig file
|
2018-12-03 12:10:37 +01:00 |
|
|
|
2cebec90ee
|
users: added setroi and getroi, modified multi to allow imod for setroi on sls level, modified detectorsize to set a single roi or give roi if only one roi
|
2018-12-03 11:50:56 +01:00 |
|
|
|
c611523352
|
updated users class: get/set detector size sets one roi /get roi if roi enabled. mythen is not supported anymore, hence
|
2018-12-03 11:17:30 +01:00 |
|
|
|
a774c62cd4
|
binaries udpated
|
2018-12-03 10:56:24 +01:00 |
|
|
|
550ed4b1c2
|
eiger server bug fix: read and write reg only wrote to the right fpga, fixed
|
2018-12-03 10:55:32 +01:00 |
|
|
|
2c08c1e7ce
|
updated binary
|
2018-12-03 10:49:26 +01:00 |
|
|
|
2b0208bd98
|
gotthard server bug fix: adc channel shifted by one fixed changin token timing rev for board 2
|
2018-12-03 10:48:52 +01:00 |
|
|
|
f120f9c3dd
|
users bug fix:getting id(version) for single/multi detector
|
2018-11-30 16:00:27 +01:00 |
|
|
|
262bf1b307
|
users class: added stopped to getrunstatus list
|
2018-11-30 15:42:13 +01:00 |
|
|
|
4d0090dfcc
|
ctb server: added brackets around char* in write to socket
|
2018-11-21 15:57:46 +01:00 |
|
|
|
e98d60c26e
|
updated ctb binary
|
2018-11-21 15:35:59 +01:00 |
|
|
|
cd3135c01d
|
loophole for blackfin not checking the data sent, hence splitting data to a few packets when size > 30k bytes
|
2018-11-21 15:34:58 +01:00 |
|
|
|
817736fcd5
|
after merging with developer
|
2018-11-02 10:48:06 +01:00 |
|
|
|
660ed4c177
|
changed users set/getDetectorsize API to include a single ROI
|
2018-10-25 14:11:40 +02:00 |
|
|
|
def79807f6
|
merge conflict resolved from 4.0.0
|
2018-09-28 16:28:21 +02:00 |
|
|
|
e631414526
|
updated version
|
2018-09-27 18:23:08 +02:00 |
|
|
|
f9b95b63eb
|
gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all
|
2018-09-27 18:20:03 +02:00 |
|
|
|
c2db073d5e
|
receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved
|
2018-09-26 15:03:04 +02:00 |
|
|
|
970d448e73
|
receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5
|
2018-09-26 10:53:45 +02:00 |
|
|
|
5a139d70b5
|
gotthard and jungfrau server binary updated for API
|
2018-09-25 14:08:34 +02:00 |
|
|
|
33d1b11279
|
jungfrau server updated for API version change
|
2018-09-25 14:04:54 +02:00 |
|
|
|
b163180d6f
|
updating API versions
|
2018-09-25 14:02:22 +02:00 |
|
|
|
cab9dff225
|
Merge branch '4.0.0' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.0
|
2018-09-25 13:55:42 +02:00 |
|
|
|
7d8188fc11
|
gotthard server binary updated: config file not read a second time after detector start up
|
2018-09-25 13:55:26 +02:00 |
|
Erik Frojdh
|
64229ca32b
|
changed operator() to const
|
2018-09-25 11:20:44 +02:00 |
|
|
|
ae8678cdc2
|
New Zmq header staructur implemented and works, still different number of pixels in the GUI should be fixed (but it does not crash)
|
2018-09-25 09:36:47 +02:00 |
|
|
|
4aa0d26f26
|
gotthard server: trying to resolve roi problem that is only affected by latest firmware
|
2018-09-21 17:29:43 +02:00 |
|
|
|
c784f0f539
|
client: moved shortenable to roi in reciever, roi not yet written in master file
|
2018-09-19 17:35:26 +02:00 |
|
|
|
961489edb1
|
bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware
|
2018-09-18 18:02:01 +02:00 |
|
|
|
781152a772
|
slsDetectorSoftware bug fix: gappixels for x initialized wrong
|
2018-09-17 18:13:26 +02:00 |
|
|
|
59cb9c84c2
|
bug fix slsdetectorgui: xcoord and y coord are actually col and row indices
|
2018-09-17 14:35:31 +02:00 |
|
|
|
f288390255
|
Zmq communication uses additional headers, moench processing fixed
|
2018-09-11 17:05:11 +02:00 |
|
|
|
ed0b22b500
|
updated binaries
|
2018-08-24 13:18:51 +02:00 |
|
|
|
1b55fdad86
|
merged selected patches from 4.0.0 branch
|
2018-08-24 13:10:16 +02:00 |
|
|
|
14c899e7cf
|
removed some manual warnings
|
2018-08-24 12:34:06 +02:00 |
|
|
|
588037fd18
|
updated release version
|
2018-08-23 16:23:24 +02:00 |
|
|
|
e0b8fb3609
|
updated manuals, jungfrau server (reqd firmware vversion)
|
2018-08-23 15:52:12 +02:00 |
|
|
|
cea6c30ded
|
updating release.txt, version API
|
2018-08-23 12:48:08 +02:00 |
|
|
|
0781344117
|
updating binaries
|
2018-08-22 19:00:21 +02:00 |
|
|
|
63c130a380
|
client:updated users class and release.txt
|
2018-08-22 18:08:35 +02:00 |
|
|
|
7945d15beb
|
client: updating release.txt, updating command line help, catching slsDetectorUsers exception from multislsdetector constructor
|
2018-08-21 18:49:29 +02:00 |
|
|
|
4e446f1f39
|
eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server
|
2018-08-17 13:45:09 +02:00 |
|
|
|
2a28333a96
|
jungfrau server: allow check version in update mode
|
2018-08-16 15:09:29 +02:00 |
|
|
|
830f92dedc
|
client and receiver: silent mode put into shared memory, works properly now
|
2018-08-15 19:51:04 +02:00 |
|
|
|
87e8333dfd
|
slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener
|
2018-08-15 19:02:16 +02:00 |
|
|
|
f0ac49190a
|
slsReceiver:trying to get deactivate to work
|
2018-08-14 15:06:06 +02:00 |
|
|
|
921ae01bbe
|
jungfrau module data, fixel moench02 for jctb and jctb server actualized for both buses
|
2018-08-13 16:27:36 +02:00 |
|
