Dhanya Maliakal
|
bef8d413d6
|
jungfrau done but not merged
|
2016-01-21 14:43:44 +01:00 |
|
Dhanya Maliakal
|
f477b7a5ac
|
not much changes
|
2016-01-19 16:25:48 +01:00 |
|
Dhanya Maliakal
|
532ac38ad5
|
dont know
|
2015-12-09 16:15:23 +01:00 |
|
Dhanya Maliakal
|
b05207221c
|
ansi and test server for jungfrau server
|
2015-12-01 16:45:18 +01:00 |
|
Dhanya Maliakal
|
61f0506c2c
|
settings for jungfrau
|
2015-12-01 16:43:23 +01:00 |
|
Dhanya Maliakal
|
58dbc59af2
|
masking vvalues for jungfrau
|
2015-11-27 17:32:46 +01:00 |
|
Dhanya Maliakal
|
0958a4544e
|
jungfrau works
|
2015-11-27 15:56:29 +01:00 |
|
Dhanya Maliakal
|
ac53cb2ae4
|
resetting the acquiringflag whenever acquisition stop is called
|
2015-11-24 15:25:42 +01:00 |
|
Dhanya Maliakal
|
5012ea0c6c
|
unnecessary lock in acquire
|
2015-11-24 13:50:42 +01:00 |
|
Dhanya Maliakal
|
8ae1e812e6
|
pulse chip fixed
|
2015-11-20 16:41:27 +01:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
a1bd54b16b
|
pulsing in client and server
|
2015-11-19 17:43:46 +01:00 |
|
Dhanya Maliakal
|
e0464ef782
|
pulsing client side, and bug fix server side for reset partially
|
2015-11-19 16:15:59 +01:00 |
|
Dhanya Maliakal
|
291fe8bc22
|
socket disconnecting in receiver
|
2015-11-19 11:10:59 +01:00 |
|
Dhanya Maliakal
|
8b0895add0
|
reset counter bit in eiger detector partially or completely
|
2015-11-17 16:39:36 +01:00 |
|
Dhanya Maliakal
|
11dafc6ebf
|
resetting frame number done after resetting detector (prepareforacquisition) eiger server
|
2015-11-17 15:28:47 +01:00 |
|
Dhanya Maliakal
|
bc55f9d1e4
|
edited getdatafromdetector to not stop detector for eiger
|
2015-11-17 12:00:42 +01:00 |
|
Dhanya Maliakal
|
66db11421f
|
implemented fifo depth configurable from client
|
2015-11-17 10:30:53 +01:00 |
|
Dhanya Maliakal
|
f68d6d0ab6
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-11-13 17:49:36 +01:00 |
|
Dhanya Maliakal
|
c43af96487
|
some changes refactoring and reducing time spent
|
2015-11-13 17:47:44 +01:00 |
|
l_msdetect
|
fa80d6a205
|
change settings for eiger
|
2015-11-13 11:43:19 +01:00 |
|
Dhanya Maliakal
|
ab9e01f212
|
usleep in detector taken off
|
2015-11-12 15:30:56 +01:00 |
|
Dhanya Maliakal
|
62c92dd364
|
changing to random read when no gui at beginnning of acquire
|
2015-11-12 15:05:56 +01:00 |
|
Dhanya Maliakal
|
816543f358
|
detector ip for eiger is replaced by hardware ip for 1g
|
2015-11-06 11:10:51 +01:00 |
|
Dhanya Maliakal
|
bc6dfca552
|
ensuring vthreshold returns the right value
|
2015-11-03 15:22:57 +01:00 |
|
Dhanya Maliakal
|
2e701168b9
|
forgot to add eiger server
|
2015-11-02 12:32:56 +01:00 |
|
Dhanya Maliakal
|
2152eb1d28
|
detector id returns a number form a file or 0 if no file: eiger
|
2015-11-02 12:31:19 +01:00 |
|
Dhanya Maliakal
|
dd1233bc7c
|
outdir for multi is for all
|
2015-10-26 11:26:16 +01:00 |
|
Dhanya Maliakal
|
feb6f0d0e2
|
THE REAL CHANGE: previous ones dont work:fixed bug gotthard server: dynamic gain and confgain values
|
2015-10-23 11:41:05 +02:00 |
|
Dhanya Maliakal
|
64c0fdfaef
|
fixed bug gotthard server: dynamic gain and confgain values
|
2015-10-23 11:30:37 +02:00 |
|
Dhanya Maliakal
|
0ea9cc34b0
|
changed gotthard dynamic gain value and fixed bug of writing settings enum with more offset to not mixup with conf gain value in firmware
|
2015-10-23 10:57:45 +02:00 |
|
Dhanya Maliakal
|
8ffdcb08c9
|
fixed the set trimbit getting stuck bug. was due to gain and offset not sent properly for eiger
|
2015-10-15 16:00:09 +02:00 |
|
Dhanya Maliakal
|
6ab7947b97
|
fixed the gain and offset default values uploaded for eiger
|
2015-10-14 10:47:43 +02:00 |
|
Dhanya Maliakal
|
25dbaa4e09
|
fixed the gain and offset default values uploaded for eiger
|
2015-10-14 10:38:39 +02:00 |
|
|
8972fa1143
|
EigerDetectorServer for firmware version 11, changes: direct write into udp block ram
|
2015-10-08 17:29:13 +02:00 |
|
|
5057fd4eef
|
changed energyConversion.h to compile the calibration wizards
|
2015-09-24 11:10:12 +02:00 |
|
|
11de59d87c
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-09-24 10:54:48 +02:00 |
|
|
33cf26648b
|
no real changes
|
2015-09-24 10:54:43 +02:00 |
|
Dhanya Maliakal
|
cf787c9e7d
|
minor warnings removed
|
2015-09-23 17:01:44 +02:00 |
|
Dhanya Maliakal
|
a770389c90
|
including subframe index from receiver to client and also sending this to gui
|
2015-09-23 11:50:02 +02:00 |
|
Dhanya Maliakal
|
271838b2b5
|
changes to includes clkdivider and flags in gui and modify the server for proper checks
|
2015-09-10 11:29:15 +02:00 |
|
Dhanya Maliakal
|
584b9e6036
|
added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger
|
2015-09-04 15:54:12 +02:00 |
|
|
7f168e3a70
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-09-03 15:40:11 +02:00 |
|
|
681ed0f34f
|
added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software
|
2015-09-03 15:39:54 +02:00 |
|
Dhanya Maliakal
|
cae286941a
|
added subframe exposure time settable
|
2015-09-03 15:16:48 +02:00 |
|
Dhanya Maliakal
|
95324fc929
|
resets footer frame numbers
|
2015-09-02 11:06:07 +02:00 |
|
|
34a1dac0fe
|
sls_detector_acquire [id-] should finally work
|
2015-08-31 14:44:40 +02:00 |
|
|
d19b051860
|
reverting multiSlsDetectorClient to previous version otherwise the index of the detector does not work with default multidetector index. Use sls_detector_get 1-acquire for acquiring with multiple multi-detectors
|
2015-08-28 12:58:26 +02:00 |
|
|
b073ecacb9
|
multiple detector on one PC should now work
|
2015-08-28 12:14:55 +02:00 |
|
|
84ad2912c6
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-08-28 10:55:22 +02:00 |
|