Commit Graph

4087 Commits

Author SHA1 Message Date
24d0d776b7 new gotthard server binary 2017-08-16 16:04:47 +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
eaed8bab08 Merge branch '3.0-rc' into developer 2017-08-16 11:50:13 +02:00
3c59b3b8dd updated command line doc 2017-08-16 11:50:01 +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
8bc039c95f updated command line doc 2017-08-16 11:13:32 +02:00
b0b3701fcf moved the output dir of slsdetectorClientDocs 2017-08-16 11:11:26 +02:00
c489aeb9dc moved the output dir of slsdetectorClientDocs 2017-08-16 11:11:13 +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
ca865a6636 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-08-16 09:27:48 +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
193139f06f Merge branch '3.0-rc' into developer 2017-08-15 18:08:01 +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
6a2c0ac86d added command line documentation in release.txt 2017-08-15 18:06:20 +02:00
9bb8a94c55 updated README 2017-08-15 14:14:47 +02:00
f8bb6a04a9 so that the first image shows 2017-08-15 14:10:43 +02:00
1e7932f09c switched back to 200ms 2017-08-15 14:00:34 +02:00
02b6228856 updated eiger server 2017-08-15 13:59:03 +02:00
bcf5e1fc0b updated server binary 2017-08-14 15:07:36 +02:00
3fb92aa9dd changes done 2017-08-14 13:33:24 +02:00
77d688e508 changes done 2017-08-14 13:33:11 +02:00
1ec3a69e29 print memory allocated properly 2017-08-14 10:49:08 +02:00
3aeb15648c Anna's modifications 2017-08-11 15:55:07 +02:00
52e1bd32b9 Anna's modifications 2017-08-11 15:52:08 +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
92ae104f39 Merge branch '3.0-rc' into developer 2017-08-10 18:46:42 +02:00
ae6884949b Merge branch '3.0-rc' into developer 2017-08-10 18:46:42 +02:00
1a313e4d5d 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:21 +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
c724756b5f included subexptime in metadata for hdf5 2017-08-10 17:33:32 +02:00
ad3e3ce255 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:28 +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
11943c4b5c merge insignificant conflicts 2017-08-10 11:19:36 +02:00
389f356a3a high voltage reflects the master only, if 2 masters reflects -1 2017-08-10 11:09:44 +02:00
0219d09067 sub frame number for eiger in master ascii file, instead of exposure length 2017-08-10 11:07:56 +02:00
df11f41416 reworked version 2017-08-10 10:04:00 +02:00