28 Commits

Author SHA1 Message Date
l_maliakal_d
e4d477b53e included settting up of udpport from client and getting receiver mac from receiver and also listening to only one ethernet interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@370 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-06 14:22:08 +00:00
l_maliakal_d
f20e40025b got rid of fifo full message in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@369 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-06 09:53:49 +00:00
l_maliakal_d
3b2a8ea13a max frames per file, getting config filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@368 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-05 16:40:51 +00:00
l_maliakal_d
788bc9cfd7 made change to avoid compiltime errors with new gcc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@366 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-05 08:49:26 +00:00
l_maliakal_d
8df3541e47 some insignificant tuning in slsReceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@364 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-03 09:45:50 +00:00
l_maliakal_d
6b935f3bd2 included exitReceiver, using different threads to listen and write packets in receiver, edited circularfifo to use pointer references, and acquire returns frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@362 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-30 09:28:52 +00:00
l_maliakal_d
d8af12456d receiver does the flipping and processing before sending client the correct frame to display
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@361 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-26 15:33:53 +00:00
l_cartier
997ffec2ee git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@360 951219d9-93cf-4727-9268-0efd64621fa3 2012-11-23 16:30:49 +00:00
l_maliakal_d
d0d7eac553 fixed gui expecting more databytes from receiver, cuz of probes changing databytes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@359 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-23 16:15:26 +00:00
l_mozzanica
5236aa7cce added some includes for genericSocket.h x86_64
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@358 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-23 13:54:12 +00:00
l_maliakal_d
a781ca3422 edited generic socket for udp socket, prob:gap in files when using smaller buffers
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@357 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-22 13:55:37 +00:00
l_maliakal_d
c02075dc12 included a short filename for receiver for sebastian, which has a frameindex incrementing by 1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@356 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-22 12:45:42 +00:00
l_maliakal_d
6a74fda3ed modified receiver to save a simpler file name for sebastian, set receiver port modified
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@355 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-22 10:25:42 +00:00
bergamaschi
6ffe7ff229 makefile changed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@353 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-21 09:01:14 +00:00
l_maliakal_d
ffd392c7eb fixed changing ports inreceiver, included receiver config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@351 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-20 16:50:36 +00:00
l_maliakal_d
97ed3e8872 made udp socket in receiver use generic socket, included a incrememnt frame index in acquire before a break, got rid of infinite loop for unmatched index in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@350 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-19 16:29:17 +00:00
l_maliakal_d
3c94d2cb40 converted to c++
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@347 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-19 12:41:35 +00:00
l_maliakal_d
58623dcd34 fixed file index problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@346 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-15 13:54:02 +00:00
l_maliakal_d
e4e46920cd fixed frames from receiver to flip accordingly, also display frame index as not visible from filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-15 11:19:50 +00:00
l_maliakal_d
89ddfa9b51 fixed the problem with multiple frame scan, frame index and file index included in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@344 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 13:43:42 +00:00
bergamaschi
e0a1e4ab36 warnings fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@343 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 11:37:06 +00:00
l_maliakal_d
dc94fc3c97 receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@339 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 10:21:22 +00:00
l_maliakal_d
bf7da5f493 closeDataFile is only for gotthard and included lock for socket while using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@338 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 08:38:18 +00:00
l_maliakal_d
8f7872d056 gotthard receiver works so far without cpu file write and tcp generic socket lock
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-12 15:48:28 +00:00
bergamaschi
3f1780f71b circular fifo from the web added to the svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@331 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-31 09:45:59 +00:00
bergamaschi
96d08d61d0 frame index in file name, increments instead of file index for real time acquisitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 15:52:40 +00:00
l_maliakal_d
2f9dea8341 forgot to add slsREceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@329 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 14:30:57 +00:00
l_maliakal_d
2338de4054 added receiver in here
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 10:06:58 +00:00