|
|
714e1a7f72
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-03-31 13:55:21 +02:00 |
|
|
|
1edcdff936
|
Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1
|
2015-03-31 13:54:59 +02:00 |
|
Dhanya Maliakal
|
e35867227f
|
writing frame number to the file for eiger
|
2015-03-30 17:16:31 +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
|
1611dde9d4
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package
|
2015-03-25 15:37:31 +01:00 |
|
Dhanya Maliakal
|
24bcb04372
|
included flag for eiger fifo debug
|
2015-03-25 15:37:07 +01:00 |
|
Dhanya Maliakal
|
1ad0bc56e7
|
included slsDetectorUsers
|
2015-03-25 15:26:38 +01:00 |
|
|
|
248848c666
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-03-24 09:49:41 +01:00 |
|
|
|
f461ddf2b7
|
slsDetectorUSers re-added to Makefile - don't remove it again
|
2015-03-23 15:42:12 +01:00 |
|
|
|
1df89d4ce2
|
test
|
2015-03-23 11:41:19 +01:00 |
|
|
|
9e78bae614
|
solved bad_alloc
|
2015-03-23 11:18:24 +01:00 |
|
|
|
36191396b2
|
added pull.sh and fetch.sh
|
2015-03-13 13:35:40 +01:00 |
|
Dhanya Maliakal
|
477b2fb467
|
acquire works properly now
|
2015-03-12 16:47:20 +01:00 |
|
Dhanya Maliakal
|
89ad2112c6
|
difference between acquisition index and frame index
|
2015-03-12 12:25:23 +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
|
6063c712f7
|
copy first frame to latest data no matter what and also copy only if more than packets per frame
|
2015-03-10 15:04:50 +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 |
|
|
|
cd67991357
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-03-06 10:43:22 +01:00 |
|
|
|
c7aea8f2a6
|
Some changes for the JCTB software
|
2015-03-06 10:43:05 +01:00 |
|
Dhanya Maliakal
|
2f82469531
|
fifo debug with color done
|
2015-03-05 15:21:12 +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
|
5682a6b458
|
moved startframeindice to before stop listening for gotthard
|
2015-02-25 10:34:57 +01:00 |
|
Dhanya Maliakal
|
875ee02038
|
got ridf of warnings for eiger server
|
2015-02-25 10:34:18 +01:00 |
|
Dhanya Maliakal
|
3ee146a2ca
|
moved start of frame to after stoplistening, for eiger to ignore incomplete frames
|
2015-02-24 16:19:33 +01:00 |
|
Dhanya Maliakal
|
2c2d2171d2
|
get the last frame in eiger with acquiringdone
|
2015-02-24 16:10:31 +01:00 |
|
Dhanya Maliakal
|
651a13f811
|
so that gui can reread the same frame from receiver, guidataready is set to zero only once
|
2015-02-23 15:25:06 +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
|
59c3d26c96
|
added script ot checkout
|
2015-02-18 13:48:08 +01:00 |
|
Dhanya Maliakal
|
e3e7b3a885
|
eiger settings files
|
2015-02-13 15:29:11 +01:00 |
|
Dhanya Maliakal
|
6d8fcaa423
|
debugging output change
|
2015-02-13 11:58:36 +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
|
1e55577fc2
|
no change
|
2015-02-10 16:54:39 +01:00 |
|
Dhanya Maliakal
|
c5f8067735
|
Merge branch 'dhanya_devel'
|
2015-02-10 16:44:57 +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 |
|
Dhanya Maliakal
|
bea1791b4d
|
initializing variables and copying ot gui only full frames
|
2015-02-10 12:21:31 +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 |
|
Dhanya Maliakal
|
e975a75be9
|
some code refraction to get rid of memeory leakage
|
2015-02-04 16:11:13 +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 |
|
Dhanya Maliakal
|
7fd12f97b4
|
some unnecessary printouts
|
2015-01-30 16:49:30 +01:00 |
|
