|
|
6cc22a350d
|
Merge branch 'release' into jungfrauv1.0
|
2016-02-03 15:05:50 +01:00 |
|
|
|
e3d9fd1c02
|
Merge branch 'release' into jungfrauv1.0
|
2016-02-03 14:59:22 +01:00 |
|
|
|
8ca9157882
|
corrected checkout script
|
2016-02-02 11:37:40 +01:00 |
|
|
|
316ecf1b50
|
no change check
|
2016-02-02 11:10:49 +01:00 |
|
|
|
d0a38d203d
|
Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release
|
2016-02-02 10:50:25 +01:00 |
|
|
|
b27e42f193
|
Merge branch 'release', remote branch 'origin' into release
|
2016-02-02 10:48:15 +01:00 |
|
|
|
0ce03226ee
|
changed the checkout script to point to new remote repo
|
2016-02-02 10:42:59 +01:00 |
|
|
|
bef8d413d6
|
jungfrau done but not merged
|
2016-01-21 14:43:44 +01:00 |
|
|
|
f477b7a5ac
|
not much changes
|
2016-01-19 16:25:48 +01:00 |
|
|
|
1477f67c4c
|
eiger documentation
|
2016-01-15 14:39:02 +01:00 |
|
|
|
a785eb7d5e
|
newline after wrong command
|
2016-01-08 17:18:50 +01:00 |
|
|
|
22cb739c7f
|
start to update manuals for Eiger
|
2016-01-08 17:13:48 +01:00 |
|
|
|
09807aae49
|
Added slsReceiverScript and xterms
|
2015-12-16 16:14:18 +01:00 |
|
|
|
5c239ad45f
|
data call back form receiver includes both x and y dimensions
|
2015-12-16 15:01:00 +01:00 |
|
|
|
ff7a2d5185
|
Added slsReceiverScript and xterms
|
2015-12-15 16:31:18 +01:00 |
|
|
|
06e810169d
|
Revert "trying to fix for 2D detector(eiger)"
This reverts commit 0a471f54edffb54a9871bbc8ebb241c22775451c.
|
2015-12-15 16:29:47 +01:00 |
|
|
|
54c1765f34
|
Revert "Revert "pulse chip fixed""
This reverts commit 356e6cb8cacec52ec6883e625a6b3639633f3b0e.
|
2015-12-15 16:29:35 +01:00 |
|
|
|
ca6f2b8588
|
Revert "pulse chip fixed"
This reverts commit f85739e8b64a3b0c7af02d068a2cc429064ad103.
|
2015-12-15 16:26:44 +01:00 |
|
|
|
7848b79cf2
|
2d noop for setdetectorsize
|
2015-12-15 16:24:43 +01:00 |
|
|
|
cd80160e7d
|
getdetectorsize in users reflects 2d addon
|
2015-12-15 15:40:39 +01:00 |
|
|
|
2dd2b577fd
|
getdetectorsize in users reflects 2d
|
2015-12-15 15:36:49 +01:00 |
|
|
|
d6c4ec184a
|
should show progress for each measurement, not collectively
|
2015-12-15 14:25:53 +01:00 |
|
|
|
921154e43a
|
detsizechan or maximum detecto size for users incorrectly implemented for only 1d
|
2015-12-15 12:07:28 +01:00 |
|
|
|
50d76f5537
|
iodelay set to 650, rxb_lb and rb set to 1100, 10g detectormac set to +1 of 1g
|
2015-12-14 15:15:27 +01:00 |
|
|
|
532ac38ad5
|
dont know
|
2015-12-09 16:15:23 +01:00 |
|
|
|
4fc8065ef5
|
trying to fix for 2D detector(eiger)
|
2015-12-08 13:26:17 +01:00 |
|
|
|
0f6fa37ca1
|
new default files
|
2015-12-02 16:50:03 +01:00 |
|
|
|
4dc8213cf6
|
added jungfrau settings directories
|
2015-12-01 16:46:07 +01:00 |
|
|
|
b05207221c
|
ansi and test server for jungfrau server
|
2015-12-01 16:45:18 +01:00 |
|
|
|
61f0506c2c
|
settings for jungfrau
|
2015-12-01 16:43:23 +01:00 |
|
|
|
58dbc59af2
|
masking vvalues for jungfrau
|
2015-11-27 17:32:46 +01:00 |
|
|
|
0958a4544e
|
jungfrau works
|
2015-11-27 15:56:29 +01:00 |
|
|
|
ac53cb2ae4
|
resetting the acquiringflag whenever acquisition stop is called
|
2015-11-24 15:25:42 +01:00 |
|
|
|
5012ea0c6c
|
unnecessary lock in acquire
|
2015-11-24 13:50:42 +01:00 |
|
|
|
8ae1e812e6
|
pulse chip fixed
|
2015-11-20 16:41:27 +01:00 |
|
|
|
c097dfc8b3
|
two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc
|
2015-11-20 16:28:48 +01:00 |
|
|
|
a1bd54b16b
|
pulsing in client and server
|
2015-11-19 17:43:46 +01:00 |
|
|
|
e0464ef782
|
pulsing client side, and bug fix server side for reset partially
|
2015-11-19 16:15:59 +01:00 |
|
|
|
291fe8bc22
|
socket disconnecting in receiver
|
2015-11-19 11:10:59 +01:00 |
|
|
|
8b0895add0
|
reset counter bit in eiger detector partially or completely
|
2015-11-17 16:39:36 +01:00 |
|
|
|
11dafc6ebf
|
resetting frame number done after resetting detector (prepareforacquisition) eiger server
|
2015-11-17 15:28:47 +01:00 |
|
|
|
bc55f9d1e4
|
edited getdatafromdetector to not stop detector for eiger
|
2015-11-17 12:00:42 +01:00 |
|
|
|
66db11421f
|
implemented fifo depth configurable from client
|
2015-11-17 10:30:53 +01:00 |
|
|
|
f68d6d0ab6
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-11-13 17:49:36 +01:00 |
|
|
|
c43af96487
|
some changes refactoring and reducing time spent
|
2015-11-13 17:47:44 +01:00 |
|
|
|
c73d9f4103
|
merged and gotthard 2 det example
|
2015-11-13 17:44:24 +01:00 |
|
|
|
a6294a7737
|
default files
|
2015-11-13 12:12:40 +01:00 |
|
|
|
c2c428254e
|
change eiger settings
|
2015-11-13 12:04:52 +01:00 |
|
|
|
4cf263027a
|
change eiger setting dir
|
2015-11-13 11:51:17 +01:00 |
|
|
|
fa80d6a205
|
change settings for eiger
|
2015-11-13 11:43:19 +01:00 |
|
