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 |
|
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 |
|
l_maliakal_d
|
fcacc79f7b
|
reverted semaphore
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@733 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-02-06 17:05:09 +00:00 |
|
l_maliakal_d
|
83405b70c8
|
replaced usleep which waits for queue to have data, with semaphores
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@732 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-02-06 14:54:01 +00:00 |
|
l_maliakal_d
|
64d9223cb3
|
updated multi such that offsets are not updated if number of modules is just get
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@730 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-31 14:11:22 +00:00 |
|
l_maliakal_d
|
b1a13a601d
|
changed makefile back from epics, got rid of unnecessary print outs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@728 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-30 17:50:12 +00:00 |
|
x04sa
|
a7ad6b5b66
|
solevd bug on trimbit retrieving
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@718 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-28 10:17:46 +00:00 |
|
bergamaschi
|
0df206e340
|
Some debugging concerning getRunStatus
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@704 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-12-03 15:04:11 +00:00 |
|
l_maliakal_d
|
8e24fc7ef9
|
changes to receiver works for data compression. needs optimizing
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@699 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-11-28 14:31:03 +00:00 |
|
bergamaschi
|
0c3f1d95b9
|
some debugging of the post processing funcs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@698 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-11-27 12:00:04 +00:00 |
|
bergamaschi
|
1ed2ba63b5
|
solved bug on the number of chans of multiSlsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@697 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-11-21 15:57:57 +00:00 |
|
l_maliakal_d
|
57d65fd59c
|
semaphores , no usleep in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@660 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-09-04 13:10:14 +00:00 |
|
l_maliakal_d
|
b5b031a33e
|
changed default output dir to root directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@637 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-07-19 10:09:42 +00:00 |
|
l_maliakal_d
|
8720f960e7
|
implemented getting ids for eiger. also id ret should be int64_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@630 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-07-10 15:58:43 +00:00 |
|
l_maliakal_d
|
e8e2c7b3e4
|
fixed moench settings problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@628 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-06-25 11:30:29 +00:00 |
|
l_maliakal_d
|
666c73c988
|
edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-27 09:11:26 +00:00 |
|
l_maliakal_d
|
0e73372cf8
|
receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-21 13:43:25 +00:00 |
|
l_maliakal_d
|
df6774e2c6
|
users:double for time in ns, bugfix:readframe wen no gui, return ok for config
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@564 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-17 09:51:31 +00:00 |
|
x04sa
|
b660c0aebf
|
some debugging at the beamline (fnames)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@549 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-14 10:26:28 +00:00 |
|
l_maliakal_d
|
1eae11a87a
|
fixed the undefined state of gui when acquisition stopped
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@545 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-07 14:20:01 +00:00 |
|
l_maliakal_d
|
f0e30926fe
|
fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-06 16:23:13 +00:00 |
|
x04sa
|
88f3fe3b26
|
more debugging at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@538 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-30 11:25:29 +00:00 |
|
