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
|
e0464ef782
|
pulsing client side, and bug fix server side for reset partially
|
2015-11-19 16:15: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
|
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
|
dd1233bc7c
|
outdir for multi is for all
|
2015-10-26 11:26:16 +01: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 |
|
|
|
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 |
|
Dhanya Maliakal
|
8ebb34dd42
|
fixed long file names in guireducing redundancy in name
|
2015-08-28 10:23:21 +02:00 |
|
Dhanya Maliakal
|
f546814d39
|
reduced size of file names in gui
|
2015-08-27 10:44:24 +02:00 |
|
Dhanya Maliakal
|
29c62b1721
|
offsets corrected for 1.5m
|
2015-07-17 13:55:02 +02:00 |
|
Dhanya Maliakal
|
c4e0f2967f
|
solved detector organisation in client side
|
2015-06-30 11:54:13 +02:00 |
|
|
|
ba377ec273
|
Command adcreg added to write to adc registers
|
2015-05-04 13:48:46 +02:00 |
|
Dhanya Maliakal
|
7e44648da9
|
different between acquisition index and frame index
|
2015-03-12 12:22:19 +01:00 |
|
Dhanya Maliakal
|
cdd18182a8
|
resolved client side memory leak caused from gui
|
2015-03-04 16:24:03 +01:00 |
|
Dhanya Maliakal
|
85ccf64175
|
print receiver configurations for all detectors added
|
2015-03-02 13:56:23 +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
|
8863a9f880
|
no change
|
2015-02-11 11:22:54 +01:00 |
|
Dhanya Maliakal
|
5c34db9cb1
|
Merge branch 'dhanya_devel'
|
2015-02-10 14:43:17 +01:00 |
|
Dhanya Maliakal
|
aeffb4b93f
|
get detector and receiver status bug fixed
|
2015-02-02 16:31:28 +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 |
|
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
|
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 |
|
|
|
91344f54d9
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
Conflicts:
multiSlsDetector/multiSlsDetector.cpp
|
2014-11-25 11:46:34 +01:00 |
|
|
|
d10335e4a9
|
pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency
|
2014-11-25 11:38:19 +01:00 |
|
Maliakal Dhanya
|
194b41bfc5
|
changes to get index in eiger server
|
2014-11-17 14:46:28 +01:00 |
|
|
|
327c2106df
|
Some fixes for the CTB
|
2014-10-14 17:43:25 +02:00 |
|
|
|
74ef04e726
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-10-14 17:03:50 +02:00 |
|
|
|
308b3aa9b1
|
Client and jungfrau server funcs added for pattern generator
|
2014-10-14 17:03:13 +02:00 |
|
Maliakal Dhanya
|
347a36b7c1
|
module acquisition works, edit getrunstatus, added a small code for master incomplete, adjusted server to look for element in position 1 instead of zero
|
2014-10-06 11:01:51 +02:00 |
|
Maliakal Dhanya
|
d8c7201749
|
module udpport2
|
2014-09-26 11:18:59 +02:00 |
|
Maliakal Dhanya
|
56da3f42cc
|
trimbits not working yet, nth frame works for eiger, scans work for eiger
|
2014-07-31 12:11:33 +02:00 |
|
Maliakal Dhanya
|
7e46a407c6
|
added trimval function, but sending trimbits from char to int bug
|
2014-07-21 16:39:36 +02:00 |
|
Maliakal Dhanya
|
828a2dbd17
|
10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file
|
2014-07-11 13:06:48 +02:00 |
|
Maliakal Dhanya
|
018b800117
|
eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working
|
2014-07-02 10:55:32 +02:00 |
|
Maliakal Dhanya
|
1bd69fa18f
|
opened client command interface to the users class
|
2014-05-23 14:48:34 +02:00 |
|
l_maliakal_d
|
a79046162f
|
compiling with and without root defined in makefile.include
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@819 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-04-09 10:28:53 +00:00 |
|
l_maliakal_d
|
83064243e1
|
set settings for eiger drafts
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@812 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-04-01 08:46:00 +00:00 |
|
l_maliakal_d
|
5ab4a88ec5
|
set settings for eiger drafts
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@811 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-04-01 08:43:39 +00:00 |
|
l_maliakal_d
|
327db21c59
|
small variation
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@808 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-26 10:07:15 +00:00 |
|
l_maliakal_d
|
8b833b0f7e
|
removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-25 15:32:12 +00:00 |
|
l_maliakal_d
|
a892a8854c
|
compression extended to client side with r_compression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@742 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-02-24 14:58:36 +00:00 |
|
