|
|
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 |
|
|
|
be6925c504
|
fixed temperature for jungfrau in server, also for negative values
|
2017-07-06 16:07:01 +02:00 |
|
|
|
1e50bc4cc0
|
conflict git
|
2017-07-03 17:44:52 +02:00 |
|
|
|
374b07a126
|
merge developer
|
2017-07-03 17:42:06 +02:00 |
|
|
|
f944d7cae4
|
made updatereceiver to actually update client in parameters that it can
|
2017-07-03 17:37:24 +02:00 |
|
|
|
b4309a9f60
|
changed jungfrau temperature conversion but binary to follow
|
2017-07-03 14:45:44 +02:00 |
|
|
|
99dad79572
|
Somewhere
|
2017-07-03 13:46:06 +02:00 |
|
|
|
da4ffb235c
|
ensuring set detector type is the first call
|
2017-07-03 13:32:10 +02:00 |
|
|
|
b05e9c194a
|
makefiles and versioning update complete
|
2017-06-29 17:10:10 +02:00 |
|
|
|
1a74ceca3e
|
ensuring file permissions
|
2017-06-28 18:16:55 +02:00 |
|
|
|
7990dd6f77
|
fixed makefile and included correct versioning while compiling
|
2017-06-28 18:13:47 +02:00 |
|
|
|
8992d51787
|
correct binary jungfrau
|
2017-06-28 11:26:35 +02:00 |
|
|
|
4905f49108
|
added updateversion into makefile while compiling
|
2017-06-28 11:23:19 +02:00 |
|
|
|
fde7ddf832
|
added updateversion into makefile while compiling
|
2017-06-28 11:00:21 +02:00 |
|
|
|
7a8d0b8dad
|
added updateversion into makefile while compiling
|
2017-06-28 10:57:39 +02:00 |
|
|
|
56645a48af
|
added updateversion into makefile while compiling
|
2017-06-28 10:54:27 +02:00 |
|
|
|
a7d3006cda
|
added updateversion into makefile while compiling
|
2017-06-28 10:48:03 +02:00 |
|
|
|
c2624daa9a
|
uncommented a print
|
2017-06-28 10:27:40 +02:00 |
|
|
|
2126e2a723
|
added updategit
|
2017-06-28 10:24:49 +02:00 |
|
|
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +02:00 |
|
|
|
ca358e4d17
|
changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate
|
2017-06-27 17:46:32 +02:00 |
|
|
|
0b6aeac364
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-06-27 10:40:19 +02:00 |
|
|
|
5dd2f273fc
|
eigerserver changes, need to include martins changes
|
2017-06-27 10:22:55 +02:00 |
|
|
|
ffd3cb6511
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-06-26 13:03:08 +02:00 |
|
