|
|
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 |
|
|
|
97330b65ca
|
to handle frame number 0s from firmware
|
2017-08-09 18:47:55 +02:00 |
|
|
|
eed951016b
|
frame number 0 from firmware in eiger is dealt with
|
2017-08-09 18:13:23 +02:00 |
|
|
|
39847c5db6
|
esrf bug, shut down socket, but being processed and object deleted, fixed
|
2017-08-09 17:25:23 +02:00 |
|
|
|
12592c1206
|
updaterev
|
2017-08-09 17:24:43 +02:00 |
|
|
|
cb90c3722d
|
esrf bug, shut down socket, but being processed and object deleted, fixed
|
2017-08-09 17:24:34 +02:00 |
|
|
|
851914f0ae
|
manuals
|
2017-08-08 20:04:28 +02:00 |
|
|
|
e85973ec8b
|
manuals
|
2017-08-08 19:48:32 +02:00 |
|
|
|
7a30ab25bd
|
Merge branch '3.0-rc' into developer
|
2017-08-08 19:16:10 +02:00 |
|
|
|
5a45f15c7f
|
fixed the frameindex bug (always 0)
|
2017-08-08 19:15:57 +02:00 |
|
|
|
558e5e2e9a
|
added busy command, converted get frames etc to an integer output
|
2017-08-08 19:15:20 +02:00 |
|
|
|
82d21b6971
|
changes to release.txt to include busy command and the frameindex bugfix
|
2017-08-08 19:13:22 +02:00 |
|
|
|
ccc60dacf4
|
updated release.txt and the cmk.sh help script
|
2017-08-08 16:24:33 +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 |
|
|
|
557d190236
|
changes for rest implementation
|
2017-08-08 14:51:32 +02:00 |
|
|
|
5c6a99afca
|
changes for rest implementation
|
2017-08-08 14:51:00 +02:00 |
|
|
|
c98c5e469b
|
added warning in makefile
|
2017-08-08 07:06:43 +02:00 |
|
|
|
d827ccc115
|
backported changes implemented in 2.3.2.rest
|
2017-08-08 06:55:52 +02:00 |
|
|
|
a40d18f8b2
|
last packet even if many padded packets in between should be written (from carryoverflag)
|
2017-08-07 19:58:48 +02:00 |
|
|
|
0cd18a3b7a
|
more comments
|
2017-08-07 10:39:29 +02:00 |
|
|
|
ebe01104e7
|
Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc
|
2017-08-07 10:31:17 +02:00 |
|
|
|
6b8b6b4b3d
|
no need of quotes for gitall.sh
|
2017-08-07 10:31:11 +02:00 |
|
|
|
31026576f4
|
delete cache before (re-)running cmake
|
2017-08-07 09:54:03 +02:00 |
|
|
|
2c58bc6a5c
|
included numbe of compiler threads
|
2017-08-04 19:12:44 +02:00 |
|
|
|
3ed2bcf3fa
|
added cmk.sh to build cmake files and compile
|
2017-08-04 18:54:22 +02:00 |
|
|
|
8f1e8b1196
|
cmake withotu hdf5
|
2017-08-04 15:40:44 +02:00 |
|
|
|
c0d6958e37
|
no changE
|
2017-08-04 15:40:21 +02:00 |
|
|
|
d2d2959237
|
Merge branch '3.0-rc' into developer
|
2017-08-04 14:21:31 +02:00 |
|
|
|
c31ee2d76f
|
allowing -1 in gui for spinbox
|
2017-08-04 14:20:51 +02:00 |
|
|
|
dc318d3f47
|
updaterev
|
2017-08-04 14:20:33 +02:00 |
|
|
|
429bf7f13d
|
updaterev
|
2017-08-04 14:20:21 +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 |
|
