4726 Commits

Author SHA1 Message Date
Erik Frojdh
e2306bd41c conda recipe 2018-12-12 16:46:01 +01:00
Erik Frojdh
659faa9aaa added it back 2018-12-12 16:31:36 +01:00
Erik Frojdh
feeaebb7e4 removed branch condition 2018-12-12 16:28:58 +01:00
Erik Frojdh
547efc48e3 added conda recipe 2018-12-12 16:27:35 +01:00
Erik Frojdh
e379b98631 added header files 2018-12-12 16:10:01 +01:00
Erik Frojdh
f98259adc9 added build requirements to subpackages 2018-12-12 15:50:55 +01:00
Erik Frojdh
88e0914405 added conda recipe as a test 2018-12-12 15:23:24 +01:00
1c59c5c4f4 in between 2018-12-12 11:20:39 +01:00
79693a38f5 in between 2018-12-12 11:20:27 +01:00
9d8aa5fe91 Works with CTB5 (and should be backward compatible with the rest) 2018-12-06 17:26:54 +01:00
dceea92f1a Fixed big problem with CPU readout 2018-12-06 12:58:54 +01:00
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
87f7563035 gothard server bug fix: conf gain val instead of always dynamic gain 2018-12-05 10:35:57 +01:00
a4de4bb475 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-04 16:05:17 +01:00
b3393fc18b few gotthard bug fixes, including cs mask for adc 2018-12-04 16:02:24 +01:00
4e65a1d964 gotthard server: minor fixes 2018-12-04 14:12:11 +01:00
5e71aeb85f binaries modified 2018-12-04 13:39:27 +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
6b4a9be870 in between 2018-12-04 10:45:55 +01:00
b4b38cb607 bugfix for gotthard roi and noroi frame number, temporary fix to look at CACACACA to know if its a second packet, and first time look at last bit to know wheter to increment or not for consecutive frames fr no roi 2018-12-03 16:25:24 +01:00
98b5e893b1 rd strobe fifo for only analog fifos 2018-12-03 14:33:32 +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
0869a975e4 updated makefile in manual-api to point to binaries in bin and not build/bin. cmake points to build/bin anyway 2018-12-03 12:05:38 +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
05d8ef6277 bug fix for starting and stopping receiver, without listening 2018-12-03 10:45:46 +01:00
228cfa35c0 receiver bug fix: padding was set only if deactivated, frame padding enabled and deactivated padding enabled. Fixed that frame padding and deactivated padding is independent. Padding is done if frame padding enabled or if deactivated and deactivated padding enabled 2018-11-30 16:10:13 +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
8f3f9caf2b almost done with ctb update, need to do slow adcs, split to moench and ctb 2018-11-30 10:39:26 +01:00
Erik Frojdh
d0665ce075 tests for socket 2018-11-29 12:21:02 +01:00
Erik Frojdh
284ce30a81 starting tests 2018-11-28 14:45:50 +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
Gemma Tinti
40dedb8b07 manual 2018-11-16 17:47:41 +01:00
c19c787904 adcreg command line print 2018-11-12 15:14:37 +01:00
e3a0c1373c created AD9252 for old gotthard modules in use, it runs in both roi and non roi for old and new modules, data needs to be checked by Jiaguo to confirm some parts of the code that has FIXME to be checked later 2018-11-12 13:51:51 +01:00
8942098a90 gotthard works, data to be authenticated when personnel available 2018-11-09 15:25:26 +01:00
2e83db7d45 changed cluster file format 2018-11-09 12:34:14 +01:00
89fa30ee4b client compiles 2018-11-08 18:10:03 +01:00
2e37eda9d9 gotthard compiles 2018-11-08 18:09:11 +01:00
a37be4b2e3 fixed eiger server compiler errors 2018-11-08 17:22:59 +01:00
7a99d4155a fixed jungfrau server compile errors 2018-11-08 17:20:41 +01:00
91dd176a0f gotthard server done editing 2018-11-08 17:15:48 +01:00