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
|
1b7c42540a
|
included receiver defs in doxy
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@349 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-19 13:01:26 +00:00 |
|
l_maliakal_d
|
af3abff8dd
|
converted receiver to c++, edited generic socket to include differentclients
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@348 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-19 12:44: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 |
|
bergamaschi
|
09982d84f2
|
asm includes universally found
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@342 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-14 10:08:03 +00:00 |
|
l_maliakal_d
|
f6ff1359aa
|
implemented server to have a phase shift input
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@341 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-13 12:31:41 +00:00 |
|
bergamaschi
|
d944ee5372
|
generic socket updated
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@340 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-13 12:28:13 +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 |
|
l_maliakal_d
|
6ee21ba810
|
included progresscallback to use in the gui to get the progress for receivers
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@336 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-08 08:28:51 +00:00 |
|
l_maliakal_d
|
33fa69d546
|
configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@335 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-08 08:21:33 +00:00 |
|
l_maliakal_d
|
3cc914a8fb
|
moved configuremac to receiverip and change the config file writing to have the correct order
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@334 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-08 08:18:01 +00:00 |
|
bergamaschi
|
fa9449e447
|
genericSocket implemented with also send/receive functions, possibility to select the binding network interface for the server and utilities to get the interface name, ip or mac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@333 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-05 14:25:14 +00:00 |
|
bergamaschi
|
50beac1f8a
|
defined generic socket class for both TCP and UDP, inherited by MySocketTCP - send receive funcs should still be implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@332 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-31 11:56:01 +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 |
|
l_maliakal_d
|
007995a5ec
|
changed the default of incrememnt progress to 1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@327 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 10:04:05 +00:00 |
|
l_maliakal_d
|
b29d8d33f0
|
got rif of unnnecessary couts for receiver part in processing
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@326 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 17:02:42 +00:00 |
|
l_maliakal_d
|
439c2b1de8
|
got rid of client telling detector that receiver is down each time it doesnt work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@325 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 17:01:59 +00:00 |
|
l_maliakal_d
|
f37cd6640f
|
acquire works with receiver now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@324 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 17:00:53 +00:00 |
|
l_maliakal_d
|
30e6c810a8
|
put some printf in verbose mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@323 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:49:41 +00:00 |
|
l_maliakal_d
|
7cd1f9138e
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@322 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:48:56 +00:00 |
|
l_maliakal_d
|
69d08ac546
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@321 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:46:22 +00:00 |
|
l_maliakal_d
|
e94677cbf5
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@320 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:46:04 +00:00 |
|
l_maliakal_d
|
1f69778a6f
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@319 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:45:22 +00:00 |
|
l_maliakal_d
|
5d50fa8e00
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@318 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:44:57 +00:00 |
|
l_maliakal_d
|
b7dd317c08
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@317 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:44:07 +00:00 |
|
l_maliakal_d
|
db249237c9
|
fixed error with cleaning fifo
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@316 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 10:21:09 +00:00 |
|
l_maliakal_d
|
8387f70071
|
doxygen for slsReceiver and slsReceiverInterface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@315 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 09:38:54 +00:00 |
|
l_maliakal_d
|
83775bd7f3
|
separated slsReceiverInterface from slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@314 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 08:59:04 +00:00 |
|
l_maliakal_d
|
4dcad48ecb
|
separated slsReceiverInterface from slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@313 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 08:58:26 +00:00 |
|
l_maliakal_d
|
b52f9a8569
|
filepath, filename and index set from slsdet or multislsdet, moving all receiver coding from slsdetectorcommand to slsdetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@312 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-24 11:59:04 +00:00 |
|
l_maliakal_d
|
9b323c9e7e
|
included registers.h in server_funcs.c
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@311 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-24 08:17:58 +00:00 |
|
bergamaschi
|
da5759bed6
|
changes of get detector status by Anna-with error message
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@310 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-24 08:12:42 +00:00 |
|
bergamaschi
|
e577cd369e
|
changes of get detector status by Anna
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@309 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-24 08:09:21 +00:00 |
|
l_maliakal_d
|
964ff9006f
|
using daq register function in configuremac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@308 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 12:08:20 +00:00 |
|
l_maliakal_d
|
0c122168f3
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@307 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 10:01:26 +00:00 |
|
l_maliakal_d
|
cf5214bb01
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@306 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 10:01:16 +00:00 |
|
l_maliakal_d
|
8637272248
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@305 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 10:00:35 +00:00 |
|
l_maliakal_d
|
d115b8bf20
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@304 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 09:59:28 +00:00 |
|
l_maliakal_d
|
f2be1d5fd9
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@303 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 09:59:18 +00:00 |
|
l_maliakal_d
|
a05631f2c3
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@302 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 09:58:54 +00:00 |
|