|
|
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 |
|
|
|
785f025d1b
|
Jungfrau server with changed ADC phase
|
2014-12-19 14:28:41 +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
|
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 |
|
|
|
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 |
|
|
|
327c2106df
|
Some fixes for the CTB
|
2014-10-14 17:43:25 +02:00 |
|
|
|
308b3aa9b1
|
Client and jungfrau server funcs added for pattern generator
|
2014-10-14 17:03:13 +02:00 |
|
Maliakal Dhanya
|
d8c7201749
|
module udpport2
|
2014-09-26 11:18:59 +02:00 |
|
Maliakal Dhanya
|
7faac70c3f
|
trimbits work.
|
2014-09-09 15:42:16 +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
|
73ba765647
|
git version history
|
2014-06-03 13:55:41 +02:00 |
|
Maliakal Dhanya
|
de319249cd
|
latest update from Ian in eiger server
|
2014-05-27 15:03:08 +02:00 |
|
Maliakal Dhanya
|
28a8a3c79f
|
opened the eiger detector server to configuremac commands
|
2014-05-26 17:09:26 +02:00 |
|
Maliakal Dhanya
|
8788a060dd
|
creating a separate receiver
|
2014-05-21 09:44:35 +02:00 |
|
l_maliakal_d
|
1b2aba80a5
|
got rid of parameters such as compression and det type in receiver, theymust be sent from client to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@817 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-04-07 14:08:07 +00:00 |
|
l_maliakal_d
|
b4b69ade5f
|
set settings for eiger drafts
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@813 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-04-01 08:48:06 +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
|
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
|
1557cb1de8
|
set dynamic range implemented for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@797 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-20 16:10:25 +00:00 |
|
l_maliakal_d
|
1607ddb096
|
start and stop receiver for eiger doesnt include transmitting stage. set timer sends to anz type of receiver the num frames and acq period
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@796 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-20 10:23:19 +00:00 |
|
l_maliakal_d
|
b6d18131e8
|
got rid of sending to detector for sending via cpu flag . not needed for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@795 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-18 16:43:09 +00:00 |
|
l_maliakal_d
|
2edfb74bcd
|
commented out
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@786 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-14 11:31:10 +00:00 |
|
l_maliakal_d
|
6bb5493893
|
eiger sends #frames to rxr and gotthard send acp period to rxr. fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@780 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-14 10:56:27 +00:00 |
|
l_maliakal_d
|
8a8ee59474
|
fixed bug in settings frmes for eiger and not for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@775 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-14 10:08:52 +00:00 |
|
l_maliakal_d
|
f854477aae
|
implemented sending hostname to the receiver for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@764 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-11 10:49:35 +00:00 |
|
l_maliakal_d
|
a62ba56d78
|
frame number form receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@757 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-11 09:23:47 +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
|
c366c97023
|
tried to reduce the time to refresh measurement and settings tab
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@735 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-02-07 12:33:20 +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
|
f5413637c4
|
changed the settings comments to include that it is loaded successfully
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@731 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-31 16:31:39 +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 |
|
l_maliakal_d
|
f08d4828d9
|
display images received after detector done but receiver still processing in case of compression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@719 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-28 15:15:29 +00:00 |
|
bergamaschi
|
04239872b6
|
removed comments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@705 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-12-03 15:11:42 +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
|
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 |
|
bergamaschi
|
1673da0854
|
fixed mismatch between slsDetectorCommand and slsDetectorUsers when setting the timing mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@684 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-11-13 11:59:35 +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
|
13189b6414
|
included detailed error of settings file could not find
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@655 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-08-16 13:48:27 +00:00 |
|
l_maliakal_d
|
3098664c8f
|
fixed some probelems wuth scans for receiver and also scans for allframes/frameindex
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@654 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-08-16 12:59:42 +00:00 |
|
l_maliakal_d
|
05f54e996c
|
changed the start and stop receiver error messages to be displayed to the client and not jsus recever
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-07-30 14:49:53 +00:00 |
|
