|
|
2b05ceb281
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-06-12 13:00:21 +02:00 |
|
|
|
de0f35afb3
|
some jctb changes
|
2015-06-12 13:00:13 +02:00 |
|
Dhanya Maliakal
|
9c66e96770
|
receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore
|
2015-05-21 11:11:17 +02:00 |
|
|
|
ba377ec273
|
Command adcreg added to write to adc registers
|
2015-05-04 13:48:46 +02:00 |
|
|
|
1edcdff936
|
Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1
|
2015-03-31 13:54:59 +02:00 |
|
Dhanya Maliakal
|
7e44648da9
|
different between acquisition index and frame index
|
2015-03-12 12:22: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
|
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 |
|
|
|
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 |
|
|
|
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
|
193c62dc42
|
updating version numbers
|
2014-12-08 10:20:09 +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 |
|
|
|
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
|
dd8f48929c
|
the version given to esrf
|
2014-10-16 14:14:00 +02: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
|
62464441ee
|
vtrimbit size and vthreshold common for eiger
|
2014-09-09 17:00:26 +02:00 |
|
Maliakal Dhanya
|
7faac70c3f
|
trimbits work.
|
2014-09-09 15:42:16 +02:00 |
|
Maliakal Dhanya
|
c5a4f357bf
|
got rid of extra servers for eiger, converted to c and it works
|
2014-08-29 16:41:19 +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
|
5e6153af9e
|
fixed bug mv in dacs for command line
|
2014-07-16 10:45:35 +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
|
cf52d85f73
|
getdata from commandline was getting stuck:fixed,eiger server remembers frame and exptime period cuz getstatus doesn work for now, request images, added setting image number in eigerserver, packetsize fixed in eigerserver
|
2014-06-16 17:00:21 +02:00 |
|
Maliakal Dhanya
|
73ba765647
|
git version history
|
2014-06-03 13:55:41 +02:00 |
|
Maliakal Dhanya
|
35035405a0
|
git version history
|
2014-06-03 12:26:45 +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
|
1bd69fa18f
|
opened client command interface to the users class
|
2014-05-23 14:48:34 +02:00 |
|
Maliakal Dhanya
|
8788a060dd
|
creating a separate receiver
|
2014-05-21 09:44:35 +02:00 |
|
bergamaschi
|
2609e249ab
|
Solved problem with MYTHEN readout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@820 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-04-17 14:23:42 +00: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
|
c45c417a0a
|
got rid of trigger frame and trigger window to merge with other timing modes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@809 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-03-26 14:06:48 +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 |
|
