Commit Graph

1588 Commits

Author SHA1 Message Date
ae7255953d compile error bug fix 2017-08-16 18:37:10 +02:00
6b28201f72 comments merged 2017-08-16 17:50:46 +02:00
ae49c04dcd added documentation to slsDetectorCommand.cpp 2017-08-16 17:29:04 +02:00
0be51b69fb Merge branch '3.0-rc' into developer 2017-08-16 17:12:40 +02:00
57537a350f updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver 2017-08-16 17:12:23 +02:00
f4b01bc18b rst to sw1 for all 2017-08-16 16:03:57 +02:00
509d81ba7d Merge branch '3.0-rc' into developer 2017-08-16 11:50:26 +02:00
2935722b98 updated command line doc 2017-08-16 11:49:55 +02:00
af5f61bd95 updated command line doc 2017-08-16 11:13:40 +02:00
db983c5439 moved the output dir of slsdetectorClientDocs 2017-08-16 11:10:56 +02:00
ca6fff9648 Merge branch '3.0-rc' into developer 2017-08-16 11:04:28 +02:00
5de120f7e7 more changes to client docu. more coming up. removed slsDetectorClientDocs from here 2017-08-16 11:03:22 +02:00
c21f7f371a more changes to client docu. more coming up 2017-08-16 10:42:27 +02:00
03cc80dc3c more changes to client docu. more coming up 2017-08-16 10:36:25 +02:00
413a944e70 fixed problem with datastream help 2017-08-16 10:11:39 +02:00
25ece55d7f more changes to client docu. more coming up 2017-08-16 10:09:27 +02:00
4d493504e3 Merge branch '3.0-rc' into developer 2017-08-15 18:42:51 +02:00
bb917b70f3 more changes to client docu. more coming up 2017-08-15 18:42:41 +02:00
c0d0ebb104 Merge branch '3.0-rc' into developer 2017-08-15 18:31:12 +02:00
f8060ef757 more changes to client docu. more coming up 2017-08-15 18:29:07 +02:00
f92a6e58d3 Merge branch '3.0-rc' into developer 2017-08-15 18:07:17 +02:00
8e1a841b42 in between command line documentation 2017-08-15 18:06:45 +02:00
9bb8a94c55 updated README 2017-08-15 14:14:47 +02:00
aca3b4ca1b Merge branch '3.0-rc' into developer 2017-08-10 19:09:58 +02:00
0c6fcc1186 cannot put for get busy 2017-08-10 19:09:46 +02:00
ae6884949b Merge branch '3.0-rc' into developer 2017-08-10 18:46:42 +02:00
e8d83a085f moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix 2017-08-10 18:46:10 +02:00
f084efd263 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:18 +02:00
af079f3168 posisibility to read adnd write registers in the front end board for eiger 2017-08-10 14:49:02 +02:00
389f356a3a high voltage reflects the master only, if 2 masters reflects -1 2017-08-10 11:09:44 +02:00
7a30ab25bd Merge branch '3.0-rc' into developer 2017-08-08 19:16:10 +02:00
558e5e2e9a added busy command, converted get frames etc to an integer output 2017-08-08 19:15:20 +02:00
517dfdf523 Merge branch '3.0-rc' into developer 2017-08-08 14:59:07 +02:00
43ba40ec4c updaterev 2017-08-08 14:51:47 +02:00
d2d2959237 Merge branch '3.0-rc' into developer 2017-08-04 14:21:31 +02:00
dc318d3f47 updaterev 2017-08-04 14:20:33 +02:00
96ce9ed7c1 if timer gives -1 in multi, it should not multiply answer with 1e-9 to get in seconds in slsdetectorocmmand 2017-08-04 14:09:56 +02:00
41288302f4 fixed resolution for exptime, period and delay in server 2017-08-04 14:01:17 +02:00
039092f292 bug fix: changes for the multipurpose reg in configuremac 2017-08-04 11:21:32 +02:00
fbee70818a 25 um server using a config.txt file 2017-08-03 14:16:18 +02:00
37dd32f1b0 version 2017-07-28 11:30:21 +02:00
eb4da5ff0c removed print of elapsed time 2017-07-28 10:19:33 +02:00
c7d4582efa versioning 2017-07-27 12:08:28 +02:00
086beea501 nothing really 2017-07-26 11:35:56 +02:00
9d8faae375 fixed front end board temp 2017-07-25 13:55:27 +02:00
04165a9da8 rest implementation, index issues 2017-07-13 14:44:34 +02:00
e3667f6827 can set zmqport from receiver 2017-07-13 12:18:07 +02:00
68b1959a85 excluding detector server directories in makefile 2017-07-11 11:16:37 +02:00
931a5840e8 changes to gotthard server to include write adc, and also changes to fix the dma=dma+1 2017-07-11 10:54:21 +02:00
a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +02:00