Commit Graph

37 Commits

Author SHA1 Message Date
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
brueckner_m b193237df3 Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW) 2015-06-11 11:19:51 +02:00
brueckner_m 8a8e1b7130 Remove -DMARTIN as default flag 2015-04-21 11:11:32 +02:00
Dhanya Maliakal 031ccdf070 change to server for no serial to work 2015-03-30 15:36:55 +02:00
Dhanya Maliakal 7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
brueckner_m ed50f83fe6 Added extra debug messages (-DMARTIN) 2015-03-02 12:12:23 +01:00
Dhanya Maliakal 2c2d2171d2 get the last frame in eiger with acquiringdone 2015-02-24 16:10:31 +01:00
Maliakal Dhanya b24f374155 setting number of frames had a bug in eiger server, refactored code a bit 2014-10-20 17:33:22 +02:00
Maliakal Dhanya 5a5372350f stop server incl in makefile, master chosen based on top or bottom module at the moment 2014-10-16 13:49:56 +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 c5a4f357bf got rid of extra servers for eiger, converted to c and it works 2014-08-29 16:41:19 +02:00
Maliakal Dhanya 367bdd9c2f no change 2014-08-08 14:03:30 +02:00
Maliakal Dhanya 0ee11cffb3 merged Ians section of the code and added a few functionalities 2014-05-28 18:04:26 +02:00
l_maliakal_d 7b51dc1d89 eiger basic functionalities implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@778 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:55:14 +00:00
l_maliakal_d 65d78d017e changed dac into mV
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@765 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 14:17:27 +00:00
johnson_i a86cf645ed 2nd ci, Eiger class added, DAC test
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@670 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 13:19:10 +00:00
johnson_i 8f4a2cc182 Eiger class added, DAC test
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@668 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 13:17:11 +00:00
l_maliakal_d 78d2fa5bc6 the right mapping for pc and moving includes below the c includes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@667 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 09:22:06 +00:00
l_maliakal_d 2218a2e7e5 corrected enums, typecasted mallocs, changed eiger server to compile only in c++
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@665 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 07:02:15 +00:00
l_maliakal_d 036d72fec8 eiger server edited to include set timer, settingsand stop server for the time being
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@631 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 09:06:37 +00:00
l_maliakal_d e1ba4ff34d small bugs in nchan, nchip and dacs_int flag wasnt included
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@616 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:34:27 +00:00
l_maliakal_d 6c6a7c2679 works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@601 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 08:10:56 +00:00
l_maliakal_d 7b9e12f8ff a rough working version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@591 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-11 11:41:29 +00:00
l_maliakal_d 78aaedf243 servers, setupdetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@588 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 13:50:41 +00:00
l_maliakal_d 65fe046fef basic changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@586 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 09:05:57 +00:00
l_maliakal_d 6ace6f279a some basic changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@583 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 08:24:38 +00:00
l_maliakal_d 19a14c5861 eigerServerMakefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@580 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-28 10:07:30 +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 385a67e017 basic layout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@574 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-23 11:35:38 +00:00
l_maliakal_d e4baab9f4d reverted eiger detector server to its basic form
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@573 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 16:36:28 +00:00
l_maliakal_d bc1514edbb removed eiger detector server to revert to a basic format
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@571 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 15:30:02 +00:00
l_maliakal_d 460ffe0549 trying changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@470 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:34:35 +00:00
l_maliakal_d 1ee23e21d5 basic tcp communication with writing /reading to fpga PLB_LL_FIFO_REG_CTRL works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@441 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-29 16:34:02 +00:00
l_maliakal_d 11924d1a51 forgot to add some files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@440 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:10:46 +00:00
l_maliakal_d 39368180cb forgot to add some files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@438 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:09:51 +00:00
l_maliakal_d 55bfeb6044 added eiger server to svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@436 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:05:55 +00:00