|
|
7f7e7ca727
|
Fixed serial assignment. If top=1, serial=0 and vice versa.
|
2015-04-21 11:57:31 +02:00 |
|
|
|
8a8e1b7130
|
Remove -DMARTIN as default flag
|
2015-04-21 11:11:32 +02:00 |
|
l_brueckner_m
|
399ae4e669
|
Added colors for MARTIN debug prints
|
2015-04-20 18:22:29 +02:00 |
|
l_brueckner_m
|
39cd82f0b8
|
Added Backend board FPGA temperature support
|
2015-04-20 18:20:02 +02:00 |
|
Dhanya Maliakal
|
ee0c6c4a05
|
1 sec usleep to stop receiver for eiger
|
2015-03-31 15:00:57 +02:00 |
|
Dhanya Maliakal
|
031ccdf070
|
change to server for no serial to work
|
2015-03-30 15:36:55 +02:00 |
|
Dhanya Maliakal
|
ea4f596077
|
removed conflicts
|
2015-03-26 11:29:29 +01:00 |
|
Dhanya Maliakal
|
1ad0bc56e7
|
included slsDetectorUsers
|
2015-03-25 15:26:38 +01:00 |
|
|
|
f461ddf2b7
|
slsDetectorUSers re-added to Makefile - don't remove it again
|
2015-03-23 15:42:12 +01:00 |
|
Dhanya Maliakal
|
477b2fb467
|
acquire works properly now
|
2015-03-12 16:47:20 +01:00 |
|
Dhanya Maliakal
|
7e44648da9
|
different between acquisition index and frame index
|
2015-03-12 12:22:19 +01:00 |
|
Dhanya Maliakal
|
6232c6584a
|
put executables into git
|
2015-03-10 16:06:19 +01:00 |
|
Dhanya Maliakal
|
7a2e42d59a
|
changed the way gui polls receiver for data for nth frame and otherwise
|
2015-03-10 15:03:08 +01:00 |
|
Dhanya Maliakal
|
cdd18182a8
|
resolved client side memory leak caused from gui
|
2015-03-04 16:24:03 +01:00 |
|
Dhanya Maliakal
|
24b9402e52
|
eiger ensures the mac address is the same as the software mac address
|
2015-03-03 16:35:52 +01:00 |
|
Dhanya Maliakal
|
7cca11637a
|
include gemmas 1 module testing as well as multi module testing for serial
|
2015-03-03 14:23:05 +01:00 |
|
Dhanya Maliakal
|
2c69e45348
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-03-02 13:56:52 +01:00 |
|
Dhanya Maliakal
|
85ccf64175
|
print receiver configurations for all detectors added
|
2015-03-02 13:56:23 +01:00 |
|
|
|
ed50f83fe6
|
Added extra debug messages (-DMARTIN)
|
2015-03-02 12:12:23 +01:00 |
|
Dhanya Maliakal
|
875ee02038
|
got ridf of warnings for eiger server
|
2015-02-25 10:34:18 +01:00 |
|
Dhanya Maliakal
|
2c2d2171d2
|
get the last frame in eiger with acquiringdone
|
2015-02-24 16:10:31 +01:00 |
|
Dhanya Maliakal
|
d658799b20
|
eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing
|
2015-02-23 15:18:02 +01:00 |
|
Dhanya Maliakal
|
b2c7944014
|
type change in eiger server
|
2015-02-13 11:57:44 +01:00 |
|
Dhanya Maliakal
|
81bcb29f75
|
no hardcoded beb numbers
|
2015-02-12 12:08:21 +01:00 |
|
Dhanya Maliakal
|
8863a9f880
|
no change
|
2015-02-11 11:22:54 +01:00 |
|
Dhanya Maliakal
|
b54f3628ae
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-02-10 16:00:09 +01:00 |
|
Dhanya Maliakal
|
5c34db9cb1
|
Merge branch 'dhanya_devel'
|
2015-02-10 14:43:17 +01:00 |
|
|
|
c69ddad821
|
jungfrau detector server starts in CPU_NOT_10GB mode; ADC VREF put to 1V
|
2015-02-10 10:16:43 +01:00 |
|
|
|
4f84bb19da
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-02-04 09:28:09 +01:00 |
|
Dhanya Maliakal
|
aeffb4b93f
|
get detector and receiver status bug fixed
|
2015-02-02 16:31:28 +01:00 |
|
|
|
9ac08e5e76
|
supports frames with many samples for jctb - obtained by faking number of chips in case of many samples
|
2015-01-30 12:58:53 +01:00 |
|
Dhanya Maliakal
|
058f988586
|
Merge branch 'master' into dhanya_devel
|
2015-01-29 15:15:16 +01:00 |
|
Dhanya Maliakal
|
36d6538104
|
got rid of segmentation fault in update offfsets
|
2015-01-26 16:57:03 +01:00 |
|
Maliakal Dhanya
|
d1aa3021fb
|
includes handling dynamic range for multiple receivers for eiger
|
2015-01-14 10:18:54 +01:00 |
|
|
|
a149d7fb2e
|
usleep adeed to reduce CPU consumption
|
2015-01-08 10:29:30 +01:00 |
|
|
|
faca56f2e3
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-12-19 14:29:06 +01:00 |
|
|
|
785f025d1b
|
Jungfrau server with changed ADC phase
|
2014-12-19 14:28:41 +01:00 |
|
Maliakal Dhanya
|
f88cc1c47d
|
merged branch devel
|
2014-12-11 14:31:53 +01:00 |
|
Maliakal Dhanya
|
255f9e3fee
|
eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better
|
2014-12-11 14:16:43 +01:00 |
|
Maliakal Dhanya
|
193c62dc42
|
updating version numbers
|
2014-12-08 10:20:09 +01:00 |
|
Maliakal Dhanya
|
08a1034f63
|
back to only top gettgn acquisition
|
2014-12-08 10:16:31 +01:00 |
|
Maliakal Dhanya
|
0184970ef9
|
default dac values for eiger
|
2014-12-04 16:16:06 +01:00 |
|
Maliakal Dhanya
|
d76200e68d
|
bottom allowed
|
2014-12-04 10:49:15 +01:00 |
|
|
|
94a73ecd45
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-12-03 10:23:25 +01:00 |
|
|
|
8eea6f1d83
|
Mofifications to jungfrau server and pattern generator
|
2014-12-03 10:23:05 +01:00 |
|
Maliakal Dhanya
|
8dd7772bfe
|
stop server automatic for gemma
|
2014-12-02 16:12:45 +01:00 |
|
Maliakal Dhanya
|
28b7a73b13
|
working version for eiger detector before branching to gemma
|
2014-12-01 17:15:31 +01:00 |
|
Maliakal Dhanya
|
f79f8558f0
|
mostly to do with better testing methods in eiger server and separating acquisition, inclding start receiver etc
|
2014-11-28 14:26:47 +01:00 |
|
Maliakal Dhanya
|
4649de2742
|
some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave
|
2014-11-28 14:26:19 +01:00 |
|
|
|
5fe8c6e457
|
multiSlsDetector merging fixed
|
2014-11-25 12:00:08 +01:00 |
|
