243 Commits

Author SHA1 Message Date
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
bergamaschi
d2958eb0a4 single photon writer updated
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@706 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-05 14:51:29 +00:00
l_maliakal_d
64616be52d changes to slsreceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@703 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-03 08:54:52 +00:00
l_maliakal_d
adb500c4a0 receiver modified: fifofreed using callback, last fifo freed after all the process, using locks for fifofree, updating currentframenum only in singlephoton if datacompression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@701 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-29 11:39:22 +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
3b3e4eb8c3 some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@696 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-15 12:26:46 +00:00
l_maliakal_d
ff856d91a4 some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@695 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 16:12:37 +00:00
l_maliakal_d
eb69cabb3f some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@694 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 15:19:03 +00:00
l_maliakal_d
151725dd66 some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@693 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 14:24:26 +00:00
l_maliakal_d
0202d16d48 some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@692 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 14:18:30 +00:00
l_maliakal_d
6faf3621d5 gui progress of receiver should be of frame index and not frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@690 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:35:36 +00:00
l_maliakal_d
15f8ba344b receiver complete change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@689 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:34:56 +00:00
l_maliakal_d
3ce5db8f1d receiver complete change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@688 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:34:47 +00:00
l_maliakal_d
cd88aff756 receiver complete change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@687 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:34:31 +00:00
l_maliakal_d
a7c044ef17 small changes with singlePhotonFilter
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@679 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 08:48:50 +00:00
l_maliakal_d
75f3420888 initialized filefd to null, else if receiver goes offline tries to close file which doesnt exist
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@678 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 08:48:08 +00:00
l_maliakal_d
fbf853ea20 some more untested methods for single photon filter
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@674 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-02 14:19:26 +00:00
l_maliakal_d
4811001680 included files for data compression, saving only hits
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@671 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-17 09:29:26 +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
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
adcf1e2e8c looks at dac names in settings file for moench and gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@633 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 10:28:32 +00:00
l_maliakal_d
19d3c1eb0c fixed reading settings file for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@624 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:25:07 +00:00
l_maliakal_d
f390b7bba7 small errors in read settings file for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@615 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:33:52 +00:00
l_maliakal_d
89a8871e22 settings file shud read and write according ot dac names and can be in any order, included eiger definitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@610 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:40:47 +00:00
l_maliakal_d
d8a1e20d80 minor changes needed for receiver nthr frame
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@568 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 14:50:50 +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
l_maliakal_d
de03868f9f got rid of some useless comments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@553 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 14:16:41 +00:00