Dhanya Maliakal
|
07f1bd5c82
|
mid way, had to change to fix bug
|
2016-02-08 10:40:54 +01:00 |
|
Dhanya Maliakal
|
6cc22a350d
|
Merge branch 'release' into jungfrauv1.0
|
2016-02-03 15:05:50 +01:00 |
|
Dhanya Maliakal
|
5c239ad45f
|
data call back form receiver includes both x and y dimensions
|
2015-12-16 15:01:00 +01:00 |
|
Dhanya Maliakal
|
61f0506c2c
|
settings for jungfrau
|
2015-12-01 16:43:23 +01:00 |
|
Dhanya Maliakal
|
291fe8bc22
|
socket disconnecting in receiver
|
2015-11-19 11:10:59 +01:00 |
|
Dhanya Maliakal
|
c43af96487
|
some changes refactoring and reducing time spent
|
2015-11-13 17:47:44 +01:00 |
|
Dhanya Maliakal
|
62c92dd364
|
changing to random read when no gui at beginnning of acquire
|
2015-11-12 15:05:56 +01:00 |
|
|
|
5057fd4eef
|
changed energyConversion.h to compile the calibration wizards
|
2015-09-24 11:10:12 +02:00 |
|
|
|
11de59d87c
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-09-24 10:54:48 +02:00 |
|
|
|
33cf26648b
|
no real changes
|
2015-09-24 10:54:43 +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 |
|
Dhanya Maliakal
|
584b9e6036
|
added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger
|
2015-09-04 15:54:12 +02:00 |
|
|
|
681ed0f34f
|
added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software
|
2015-09-03 15:39:54 +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
|
2f160a7c28
|
reordered file name positions for gemma
|
2015-08-26 16:47:18 +02:00 |
|
Dhanya Maliakal
|
df1453568c
|
reverted the file name indices positioning as it doesnt work for gui
|
2015-08-26 12:50:45 +02:00 |
|
Dhanya Maliakal
|
79e13c6db7
|
using framescaught instead of frameindex in gui to get data
|
2015-08-19 15:48:14 +02:00 |
|
Dhanya Maliakal
|
225b67f5e5
|
some bug fix with file naming from previous change
|
2015-08-19 11:46:41 +02:00 |
|
Dhanya Maliakal
|
c9a952a748
|
changing file name prefix orders, reset frames caught command from command line
|
2015-08-19 11:38:09 +02:00 |
|
Dhanya Maliakal
|
a8fc34c92b
|
included propix for client
|
2015-07-21 16:26:50 +02:00 |
|
Dhanya Maliakal
|
a3a2db1f73
|
fixed 32 progress problem, and increased debugging
|
2015-06-30 17:20:23 +02:00 |
|
Dhanya Maliakal
|
b11b7c1c09
|
beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable
|
2015-06-12 17:45:43 +02:00 |
|
Dhanya Maliakal
|
8f4c2001ae
|
warning fixed
|
2015-04-15 14:49:06 +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
|
2c2d2171d2
|
get the last frame in eiger with acquiringdone
|
2015-02-24 16:10:31 +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 |
|
|
|
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 |
|
|
|
a149d7fb2e
|
usleep adeed to reduce CPU consumption
|
2015-01-08 10:29:30 +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 |
|
|
|
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
|
56da3f42cc
|
trimbits not working yet, nth frame works for eiger, scans work for eiger
|
2014-07-31 12:11:33 +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
|
4958d198d1
|
post processing does not wait if more than one positions-Annas change
|
2014-05-20 17:36:24 +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
|
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 |
|
x04sa
|
224f5cee90
|
incrmented precision of the precision on the angcallog
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@739 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-02-20 12:56:14 +00:00 |
|
l_maliakal_d
|
26c0520c10
|
semaphore just to check when it is over
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@734 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-02-06 17:25:18 +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 |
|
bergamaschi
|
154be62476
|
verbose removed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@717 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-17 08:26:21 +00:00 |
|
bergamaschi
|
28ad4a1f8c
|
bug solved in angular data merging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@716 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-17 08:25:42 +00:00 |
|
l_maliakal_d
|
0df39b24e9
|
moench should work as well.. without filer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@714 951219d9-93cf-4727-9268-0efd64621fa3
|
2014-01-16 09:46:33 +00:00 |
|
bergamaschi
|
9517d4f0f2
|
some bugs in the analysis solved
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@710 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-12-17 10:28:36 +00:00 |
|
bergamaschi
|
3fa2fe5392
|
corrected Makefile target install_inc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@708 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-12-16 10:45:58 +00:00 |
|
l_maliakal_d
|
a485e33e82
|
changed receiver to work with many writer threads for only receiver without compression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@707 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-12-16 10:07:08 +00:00 |
|
